am c540bc1d: (-s ours) am 5c8b9a68: am 2d2460c3: (-s ours) Import revised translations.  DO NOT MERGE

Merge commit 'c540bc1d6b7ef622768a9523cd30f2861c4efeaa'

* commit 'c540bc1d6b7ef622768a9523cd30f2861c4efeaa':
  Import revised translations.  DO NOT MERGE
tree: 6449bd47d3ef2164eee1ca461b7def6f8816a284
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. MODULE_LICENSE_APACHE2
  6. NOTICE