am b15b8a1e: (-s ours) am 51e51fb2: (-s ours) am 90583627: (-s ours) Import translati...
authorBaligh Uddin <baligh@google.com>
Sat, 16 Aug 2014 23:18:44 +0000 (23:18 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 16 Aug 2014 23:18:44 +0000 (23:18 +0000)
commit22b191170debc70b5bd13f0a58bcd7bb258d45db
tree6ba8baa83accc32c603cf7c83ff68c87f46d8472
parent909effb490e4eba84f9cc9ee564aae6109664028
parentb15b8a1e14ef19edeec404c795c958d79ebcb8af
am b15b8a1e: (-s ours) am 51e51fb2: (-s ours) am 90583627: (-s ours) Import translations. DO NOT MERGE

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