[automerger skipped] Import translations. DO NOT MERGE
am: 2eaace825e  -s ours

Change-Id: I0db8f2802762449a2153022c26933be44db960ff
tree: 3b22dfc8ae6cd9843b518ae65c218750bb94c230
  1. res/
  2. src/
  3. tests/
  4. tools/
  5. Android.mk
  6. AndroidManifest.xml
  7. CleanSpec.mk