tree a8e37caab386d513626f5087eb6023198486af00
parent d93c11de769ce07c9821381ca91efe3ae50de043
parent ff0f0fc58acdb1644200edba048c0c152bd6ba35
author Baligh Uddin <baligh@google.com> 1370295739 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1370295739 -0700

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

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