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

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