tree d3148a5d8d26c3d6cf6a8a55a69c0f77887a143b
parent de8a48a23f23e6ddf928b061735bc7775f97acf6
parent 48ad967b74a3935f7e3f16d06265aac2fc82afa8
author Baligh Uddin <baligh@google.com> 1383695393 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1383695393 -0800

am 48ad967b: (-s ours) am 98d24469: (-s ours) Import translations. DO NOT MERGE

* commit '48ad967b74a3935f7e3f16d06265aac2fc82afa8':
  Import translations. DO NOT MERGE