tree 01d444ab6f5dea94590c06f3016b39b0dfa794f1
parent a7707160ba8d9693ffdb813e0eb2cd3f15084a7f
parent b375339072a32c57ebb06523abeaebd2db29dc08
author Baligh Uddin <baligh@google.com> 1369865701 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1369865701 -0700

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

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