Wink Saville cd34366886 DO NOT MERGE: resolved conflicts for merge of 15e199c8 to honeycomb-plus-aosp ... Not merging this change, leaving version at 3.1.4.1.5.9.2.6.5 Change-Id: Ie9efac19da35cb72e8ae636dcfb8962a3c02ac94		2011-08-17 11:27:01 -07:00
core	am 266a571f: am dceb4655: Merge "Add sdk/assetstudio to the Windows build paths."	2011-07-29 13:59:23 -07:00
libs/host	Cygwin fix: Use new #if HAVE_STAT_ST_MTIM	2010-11-01 15:53:45 -07:00
target	am 24cad7d4: Add iptables and ip6tables to core.mk.	2011-07-29 13:58:43 -07:00
tools	resolved conflicts for merge of a74a4811 to honeycomb-plus-aosp	2011-08-11 16:55:00 -07:00
.gitignore	add a .gitignore file to make git ignore *.pyc files	2010-01-22 10:23:45 -08:00
CleanSpec.mk	Welcome, Android 3.2.	2011-06-09 16:40:02 -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 1708a6f7: am 4880b436: am 62a2b188: Merge "Avoid complaining about empty directories"	2011-07-18 13:48:43 -07:00