tree 0f766fb63af0a6adb185024e534bb81d76983236
parent e43f0d646c60c6f59333224686725717cdf2ccbc
parent 1004713867fa4476201c02c95f35c64361a6dcf2
author Baligh Uddin <baligh@google.com> 1413648343 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413648343 +0000

am 10047138: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop

* commit '1004713867fa4476201c02c95f35c64361a6dcf2':
  Import translations. DO NOT MERGE