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

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