[automerger skipped] Import translations. DO NOT MERGE am: 801246bd80 -s ours
am skip reason: subject contains skip directive

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