shared_user android-merger-prebuild be7ca98a86 reovle conflicts for cc089099 ... Change-Id: Ia449a3a3dc13928afb5c6ab6f4dcdf6eb049372b		2011-01-18 08:21:32 -08:00
core	am 68404ba4: Bump API version up to 10, thus resource version up to 11.	2011-01-16 12:46:03 -08:00
libs/host	Cygwin fix: Use new #if HAVE_STAT_ST_MTIM	2010-11-01 15:53:45 -07:00
target	Merge "add videoeditor libraries to make" into honeycomb	2011-01-17 10:52:26 -08:00
tools	update sdk template... thought this was merged already,	2011-01-17 16:44:10 -08:00
.gitignore	add a .gitignore file to make git ignore *.pyc files	2010-01-22 10:23:45 -08:00
CleanSpec.mk	Bump API version up to 10, thus resource version up to 11.	2011-01-16 11:07:28 -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
envsetup.sh	am 0332f0ac: Truly default to the full config.	2010-10-22 12:12:52 -07:00