tree 092dbf151e606889c634c3a1eab52897bdf3ef37
parent 6b7ec5b2f19e21597355d943819f7d5f9c6f4990
parent 07de1cf63102ef8f405c585e04b43366c40cc8d3
author Baligh Uddin <baligh@google.com> 1385084034 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1385084034 -0800

am 07de1cf6: (-s ours) am ded9ab3b: (-s ours) am 76ad19f1: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad

* commit '07de1cf63102ef8f405c585e04b43366c40cc8d3':
  Import translations. DO NOT MERGE