am 4f4b2bf0: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad

* commit '4f4b2bf096b337e47dd330cee87eb929363bf93e':
  Import translations. DO NOT MERGE
tree: ed08ee138964c578cbd72762222d08aca6eb11dd
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml