tree 5e6475662e1d86eea610f2fea3ae4cda84c71c0a
parent 90df491cd060d815f949fc5b177d4027fbbd399d
parent 29ce12ecd01a97802313d8e2500812889b2cf578
author Baligh Uddin <baligh@google.com> 1398219628 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1398219628 +0000

am 128f5efa: (-s ours) am 89ed56fa: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev

* commit '128f5efa7680b0a21e17c1a7ad7351ee031a4fd1':
  Import translations. DO NOT MERGE