tree d480a9df18213d791f716ded764bcd22e74dbd2d
parent e7c4833e3474258d13fcf1affeafb3d528dea6cc
parent 3e9fac9037523826464c9a6e5ae4d18e9e955f09
author Baligh Uddin <baligh@google.com> 1395958461 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1395958461 +0000

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

* commit '3e9fac9037523826464c9a6e5ae4d18e9e955f09':
  Import translations. DO NOT MERGE