tree bde4db766b585687234e96d027c8b0274b57a841
parent a83b42cb402cb5856e7490f5190c982a9f0575d8
parent 74e7e2d844c8f3d8d8e102ad5f05cddc94b230ca
author Baligh Uddin <baligh@google.com> 1400728268 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400728268 +0000

am 74e7e2d8: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev

* commit '74e7e2d844c8f3d8d8e102ad5f05cddc94b230ca':
  Import translations. DO NOT MERGE