Bart Sears 5764dca053 am bb0e59be: resolved conflicts for merge of aca203ff to ics-mr1 ... * commit 'bb0e59be7c01fd9eb85d81b92c0527bac5402d1d': ICS MR0.1 will be version 4.0.2 - do not merge		2011-11-21 08:31:56 -08:00
core	am 700b18cc: Merge "Add the support libraries to the platform documentation (build)." into ics-mr1	2011-11-18 10:14:02 -08:00
libs/host	Cygwin fix: Use new #if HAVE_STAT_ST_MTIM	2010-11-01 15:53:45 -07:00
target	am ddc943da: Fix missing SW h264 decoder and remove the non-existing SW avc decoder in product PRODUCT_PACKAGES	2011-11-04 21:39:10 +00:00
tools	use frozensets to represent APK cert sets	2011-11-11 09:51:37 -08:00
.gitignore	add a .gitignore file to make git ignore *.pyc files	2010-01-22 10:23:45 -08:00
CleanSpec.mk	MR1 is version 4.1, API 15.	2011-11-02 11:37:25 -07:00
buildspec.mk.default	Remove the simulator target from all makefiles.	2011-07-11 23:51:37 -07:00
envsetup.sh	am 3146eb76: am 1708a6f7: am 4880b436: am 62a2b188: Merge "Avoid complaining about empty directories"	2011-07-18 14:47:21 -07:00