Geoff Mendal bad1356b2d Import translations. DO NOT MERGE ...

Change-Id: Ie0d2764cd9e3289d56cc994a2a45f6f67b5ed1e6
Auto-generated-cl: translation import

2015-04-03 22:32:08 -07:00

..

java

Merge "Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE" into lmp-mr1-modular-dev

2015-03-31 19:10:50 +00:00

jni

Frameworks/base: Support dex2oat threads system property

2015-03-30 21:05:12 -07:00

res

Import translations. DO NOT MERGE

2015-04-03 22:32:08 -07:00

tests

am feb362a5: am a0d3bfbe: am 5c9d0de1: am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation

2015-01-30 22:24:43 +00:00