[automerger skipped] Import translations. DO NOT MERGE skipped: 73534775a6 skipped: 9c8f34f724 am: ac782db7b2  -s ours am: 1f6fdce0b0  -s ours am: b90a10513e  -s ours
am: 9d9ea4c320  -s ours

Change-Id: I98975c0659945be13e318b5a296fa849768eea3a
tree: 69393ba3b77370817865fdd8a39f2ca824e99aa9
  1. perf_tests/
  2. res/
  3. src/
  4. tests/
  5. Android.mk
  6. AndroidManifest.xml
  7. proguard.flags