Ying Wang 960d919e81 resolved conflicts for merge of 4df82b3e to klp-dev-plus-aosp ... Change-Id: I7a1d9e1954ede06a818814bd05a77c69f1ed3bc6		2014-02-08 10:31:46 -08:00
core	resolved conflicts for merge of 4df82b3e to klp-dev-plus-aosp	2014-02-08 10:31:46 -08:00
libs/host	Move pseudolocalize to aapt	2013-04-26 14:40:41 +01:00
target	am d21197d5: Merge "Make libart the default runtime"	2014-01-29 00:39:45 +00:00
tools	am f72e1846: am c9e142e6: Merge "add \'get started\' link to the bottom of class home pages" into klp-docs	2014-01-29 20:11:48 +00:00
.gitignore	add a .gitignore file to make git ignore *.pyc files	2010-01-22 10:23:45 -08:00
CleanSpec.mk	.1 becomes .2	2013-12-03 15:06:56 -08:00
buildspec.mk.default	Remove WEBCORE_INSTRUMENTATION and ENABLE_SVG	2013-07-25 15:52:17 -07:00
envsetup.sh	build: rename aarch64 target to arm64	2014-01-23 22:39:38 -08:00