tree c1527f0c2fa492e58dd7078585ebfb50642a853d
parent 553f2251a3163e76cb8de565282e1b627a8b15fa
parent a908efaea96e5203266b260309a8e367247ba4ef
author Baligh Uddin <baligh@google.com> 1404675217 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1404675217 +0000

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

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