tree 08148819c8491daa2d88fdd4bdeedc96b837500f
parent 27eebc0f46f97822aad605fe1c6065bcedc93333
parent 4b4c835bd9c5d9a815f09c1fb8068f57e47f4c85
author Baligh Uddin <baligh@google.com> 1397145698 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1397145698 +0000

am 4b4c835b: (-s ours) am 6a641a56: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-mister-ugly

* commit '4b4c835bd9c5d9a815f09c1fb8068f57e47f4c85':
  Import translations. DO NOT MERGE