Jean-Baptiste Queru 856c9df4fa am ff67ed65: am 5e2e09c5: (-s ours) am ee803184: am f771489d: Merge "Tweak prelink map, more" ... * commit 'ff67ed65b8d22c54b1907f2df9a690d580a9ef7b': Tweak prelink map, more		2011-06-17 08:33:23 -07:00
core	resolved conflicts for merge of 3f72af13 to master	2011-06-10 14:00:55 -07:00
libs/host	Cygwin fix: Use new #if HAVE_STAT_ST_MTIM	2010-11-01 15:53:45 -07:00
target	Enable Forward Lock DRM plugin.	2011-06-14 10:42:16 -07:00
tools	post_process_props: Write mangled properties back to file instead of stdout	2011-06-08 19:06:43 -07:00
.gitignore	…
CleanSpec.mk	Use TARGET_BOARD_INFO_FILE to locate board-info.txt	2011-06-13 17:36:08 -07:00
buildspec.mk.default	am 1884d99a: am aee4daac: The java version changed, and we made envsetup automatically find the right JAVA_HOME.	2010-06-23 16:04:38 -07:00
envsetup.sh	am ec664803: am c811f291: add ANDROID_HOST_OUT to env (please do not merge)	2011-06-07 13:15:20 -07:00