tree b6b1f2e903229bed48796b36f52fd9b64eeb8fa9
parent a7dd3c8c8720bba6484d16356d89beacaacd1316
parent 4f92101732a80539fd62c5e8ce093a78c631554f
author Baligh Uddin <baligh@google.com> 1408164188 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1408164188 +0000

am 4f921017: (-s ours) am ae8ae4a1: (-s ours) am 47066e2a: (-s ours) am 9320d054: (-s ours) am 28b08cdc: (-s ours) Import translations. DO NOT MERGE

* commit '4f92101732a80539fd62c5e8ce093a78c631554f':
  Import translations. DO NOT MERGE