tree 746c40ae9cb8f4683cf3e08377c8282cc15c32bd
parent 3e9fac9037523826464c9a6e5ae4d18e9e955f09
parent e7a646241470e6f96e7c0da76afd637dac549a81
author Baligh Uddin <baligh@google.com> 1395961493 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1395961493 +0000

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

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