tree 528e31b379420ac6bbb6f44a4529ca9f719d8764
parent 17b0ce27d83c5621ece4072dfa6315c80cb83632
parent ee6480e2d8290a030cc2dedbeb1d852719ef2505
author Baligh Uddin <baligh@google.com> 1351396094 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1351396094 -0700

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

* commit '5583758af4174a627c35358218b61bf039cf5e74':
  Import translations. DO NOT MERGE