Kenny Root 4547089af5 am 5bffb360: resolved conflicts for merge of ecbc22ea to klp-dev-plus-aosp ... * commit '5bffb360f095cb6db5ae539d1571ec1be9e8fd35': Add libcore.conscrypt tests back to CTS		2013-09-12 12:09:20 -07:00
core	resolved conflicts for merge of f913c2dd to master	2013-09-12 09:56:31 -07:00
libs/host	Move pseudolocalize to aapt	2013-04-26 14:40:41 +01:00
target	am d6d4cfed: am 5839c0f2: Remove libchromium_net from the base product.	2013-09-12 10:01:01 -07:00
tools	am cd2ced23: am d9fa5580: am 0c2b69d5: am d6125b5e: am 2552239a: fix most of size problems of DAC on handsets. set device-width for viewport tag	2013-09-11 10:22:42 -07:00
.gitignore	…
CleanSpec.mk	Remove Moto OMA DM client from build tree.	2013-08-29 17:27:21 +00:00
buildspec.mk.default	Remove WEBCORE_INSTRUMENTATION and ENABLE_SVG	2013-07-25 15:52:17 -07:00
envsetup.sh	resolved conflicts for merge of 2b5d2c55 to klp-dev-plus-aosp	2013-09-10 18:07:23 -07:00