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

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