Go to file
Narayan Kamath 8af7e8ed3e resolved conflicts for merge of 1852237a to klp-modular-dev-plus-aosp
Change-Id: I09a8a4e95fc956392a0c61f38bd12332149a8d96
2014-04-09 10:03:41 +01:00
core resolved conflicts for merge of 1852237a to klp-modular-dev-plus-aosp 2014-04-09 10:03:41 +01:00
libs/host Move pseudolocalize to aapt 2013-04-26 14:40:41 +01:00
target Merge "DO NOT MERGE: Combine emulator test projects into a single apk" 2014-04-04 16:32:06 +00:00
tools resolved conflicts for merge of 1852237a to klp-modular-dev-plus-aosp 2014-04-09 10:03:41 +01:00
.gitignore add a .gitignore file to make git ignore *.pyc files 2010-01-22 10:23:45 -08:00
CleanSpec.mk resolved conflicts for merge of 1852237a to klp-modular-dev-plus-aosp 2014-04-09 10:03:41 +01:00
buildspec.mk.default Remove WEBCORE_INSTRUMENTATION and ENABLE_SVG 2013-07-25 15:52:17 -07:00
envsetup.sh Build with java7 by default. 2014-04-04 18:44:47 -07:00