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

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