No description

Ying Wang 70d6ec5f9b resolved conflicts for merge of 0a1f3236 to honeycomb-plus-aosp ... Change-Id: I6596f4a65a99eed98bdca2d8a6840bc378297b6d		2011-03-07 11:07:12 -08:00
core	resolved conflicts for merge of 0a1f3236 to honeycomb-plus-aosp	2011-03-07 11:07:12 -08:00
libs/host	Cygwin fix: Use new #if HAVE_STAT_ST_MTIM	2010-11-01 15:53:45 -07:00
target	resolved conflicts for merge of 51de6437 to honeycomb-plus-aosp	2011-03-05 09:31:29 -08:00
tools	resolved conflicts for merge of 0a1f3236 to honeycomb-plus-aosp	2011-03-07 11:07:12 -08:00
.gitignore	add a .gitignore file to make git ignore *.pyc files	2010-01-22 10:23:45 -08: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
CleanSpec.mk	DO NOT MERGE. Hello, Android 3.0 API 11.	2011-01-23 14:49:02 -08:00
envsetup.sh	am dfa82c43: am faa68200: Merge "x86: Add in the VirtualBox emulator as a separate build target"	2011-03-05 09:20:33 -08:00