tree d0212a4cda374839ea19326b0fdf426cf80d5b2f
parent 7f6f7737b5d71ab6720c093702a99f77ddc0db02
parent 20af1d4037a14be77d59137b2fdd3caab5a40733
author Baligh Uddin <baligh@google.com> 1370100003 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1370100003 -0700

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

* commit '6d1345aa496d9f5caedae6b3b0c5b6132fb01893':
  Import translations. DO NOT MERGE