tree b51ce37457ea5b5eae1fd57f33c6a0375ad4fe63
parent edf10cc26d579019a932cd3b23b4d77586c2370f
parent 48137740b8f0af0efad73c052256af14e1825944
author Baligh Uddin <baligh@google.com> 1400728632 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400728632 +0000

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

* commit '48137740b8f0af0efad73c052256af14e1825944':
  Import translations. DO NOT MERGE