tree 8a902919d001d7eb75f0ddb70cac30bac361fd32
parent 2a6118a672846cafb816aeffa0a6ca6a4b291d81
parent 76ad19f1c70df359d03ec0d2142805c263d39a01
author Baligh Uddin <baligh@google.com> 1385083430 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1385083430 -0800

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

* commit '76ad19f1c70df359d03ec0d2142805c263d39a01':
  Import translations. DO NOT MERGE