tree 541dd2443c75089c07641649a4b66b2f05968289
parent e8a2d1f32ea31fba1378cf4ce3af25152eb9d344
parent 4226f58ccdbc0d02582e25fadeb6a0d009b8f270
author Baligh Uddin <baligh@google.com> 1368831092 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1368831092 -0700

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

* commit '082541a730e56092b948580a8e8040be78979e23':
  Import translations. DO NOT MERGE