tree 94f6d08290ab11bcf9cb897270fd3577fd9cdaf6
parent bd42c307c4c0138d36dbe22c2e1ca7e92e71b117
parent db511f2372fb542baa83838d9552d249a8c2f164
author Baligh Uddin <baligh@google.com> 1408142147 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1408142147 +0000

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

* commit 'db511f2372fb542baa83838d9552d249a8c2f164':
  Import translations. DO NOT MERGE