am 7a518a30: (-s ours) am 09128d0a: (-s ours) Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Tue, 16 Sep 2014 18:03:41 +0000 (18:03 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 16 Sep 2014 18:03:41 +0000 (18:03 +0000)
commitf89882e431314ac3fa3b1f786c8c394631faec25
tree8b8c7dc1e76c54af9ad78e93ba873068df73ec2b
parent6d94bab26fcfb93d95e0d2f1651f66d08e62b833
parent7a518a3093df5fe6217855e212d54eb161bb3a09
am 7a518a30: (-s ours) am 09128d0a: (-s ours) Import translations. DO NOT MERGE

* commit '7a518a3093df5fe6217855e212d54eb161bb3a09':
  Import translations. DO NOT MERGE