tree e857b141cf64a7f7b018876fe5cf2843350f978d
parent 7449ac53e42c472a4fdeda537d5bd54d2e5287bd
parent e252c2765cd89953998db5a7611ffaf6beabb80a
author Baligh Uddin <baligh@google.com> 1410890594 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410890594 +0000

am 60951a10: (-s ours) am 69e1dda0: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '60951a107e24712b3132e1b85bca503b8f2ecb11':
  Import translations. DO NOT MERGE