Ying Wang 51f0d3f58a resolved conflicts for merge of 70555a16 to master ... Change-Id: Ibb8ea3159e2a3fa7a70f2359a02c4625812995a8		2014-04-15 13:55:24 -07:00
core	resolved conflicts for merge of 70555a16 to master	2014-04-15 13:55:24 -07:00
libs/host	Move pseudolocalize to aapt	2013-04-26 14:40:41 +01:00
target	Merge "Add verity dev keys to build."	2014-04-04 00:49:51 +00:00
tools	am 554bb7b6: am cdbb1241: am 01adbdcb: am 613b251b: Merge "remove the animated scroll adjustment for sticky nav. Instead adjust the scroll position based on changes to the hashtag." into klp-docs	2014-04-15 20:52:27 +00: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 8af7e8ed to master	2014-04-09 12:33:03 +01:00
buildspec.mk.default	Remove WEBCORE_INSTRUMENTATION and ENABLE_SVG	2013-07-25 15:52:17 -07:00
envsetup.sh	am dbf1f804: am 80f7dbd4: Merge "gdbclient: use 64-bit suffix for all library symbols"	2014-04-10 20:20:09 +00:00