Colin Cross cf1f9d2d67 fix bad merge conflict resolution ... Change-Id: I56c885df873ff6281f62a5c4e5d4db19138b591d		2014-03-21 17:41:26 -07:00
core	Merge "Add warning message for java6 builds."	2014-03-21 10:43:49 +00:00
libs/host	Move pseudolocalize to aapt	2013-04-26 14:40:41 +01:00
target	fix bad merge conflict resolution	2014-03-21 17:41:26 -07:00
tools	am 7c3e03cf: am ce1ea340: am 7250ac63: am bb79f9d2: am b7b49711: add some css to support android wear sub-site	2014-03-18 12:46:55 +00:00
.gitignore	add a .gitignore file to make git ignore *.pyc files	2010-01-22 10:23:45 -08:00
CleanSpec.mk	4.4.3 is MR2, version boogaloo!	2014-03-11 14:54:09 -07:00
buildspec.mk.default	Remove WEBCORE_INSTRUMENTATION and ENABLE_SVG	2013-07-25 15:52:17 -07:00
envsetup.sh	OProfile is no longer compiled now.	2014-03-05 16:59:41 -08:00