tree ff24216aff4bae40e08c4d1af438385aaf85bb18
parent ae3d53c4e53b3a3fb4f785ddc17ca5c5251e311c
parent 8ab72f5f5c23df14fbd5b87ea96db37ff11866b3
author Baligh Uddin <baligh@google.com> 1369865700 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1369865700 -0700

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

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