tree 05f340db3678f94134f58463aeafef237b75c3f7
parent 50c09549e8b5a645495550ffb89b6686c46d1039
parent e98da6cd9c1a288fefad3fe616825644a69aa63b
author Baligh Uddin <baligh@google.com> 1353032369 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1353032369 -0800

am 139efdbc: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

* commit '139efdbcd66d718b0d24d42e2ea18432469ac005':
  Import translations. DO NOT MERGE