tree 1194565543bfda60d1b4a6db79c3badadf39aa62
parent 42989297a71cbb59544646fb83551aeac20cc3c5
parent e40d9a1e39596220d1949b869ed4c167ca8e63a5
author Baligh Uddin <baligh@google.com> 1370295767 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1370295767 -0700

am e40d9a1e: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

* commit 'e40d9a1e39596220d1949b869ed4c167ca8e63a5':
  Import translations. DO NOT MERGE