[automerger skipped] Import translations. DO NOT MERGE am: 47e865a4e8 -s ours am: cb393eb98b -s ours am: 21b39e833f -s ours am: 2ea3b73694 -s ours
am skip reason: subject contains skip directive

Change-Id: I1d1ee83a6e6b25163813bec76f20e3fad1557041
tree: a267314fd7e0e5867aad8e1e26294dae2178d14e
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. PREUPLOAD.cfg