tree 08148819c8491daa2d88fdd4bdeedc96b837500f
parent 8790927424ce0b1e76f15843a3980c14b4a55073
parent 6a641a569987f5edd725cb2dea6a992751cfbfbe
author Baligh Uddin <baligh@google.com> 1397145507 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1397145507 +0000

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

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