No description

Ian Rogers 2b96d6ae78 resolved conflicts for merge of 77efd7b4 to master ... Change-Id: I2ff1be499d3c4a5c7da3b016c63a519edcda458f		2014-04-22 10:03:16 -07:00
core	Merge "Support to extract JNI libs from prebuilt APK"	2014-04-21 16:24:56 +00:00
libs/host	Move pseudolocalize to aapt	2013-04-26 14:40:41 +01:00
target	resolved conflicts for merge of 77efd7b4 to master	2014-04-22 10:03:16 -07:00
tools	Fix variable name.	2014-04-15 22:31:54 +00:00
.gitignore	add a .gitignore file to make git ignore *.pyc files	2010-01-22 10:23:45 -08:00
buildspec.mk.default	Remove WEBCORE_INSTRUMENTATION and ENABLE_SVG	2013-07-25 15:52:17 -07:00
CleanSpec.mk	resolved conflicts for merge of 8af7e8ed to master	2014-04-09 12:33:03 +01:00
envsetup.sh	fix tapas to work in more shells	2014-04-16 11:34:34 -07:00