am 4aa14f03: (-s ours) am b5071e4a: (-s ours) am 4802efe1: (-s ours) Import translati...
authorBaligh Uddin <baligh@google.com>
Mon, 29 Sep 2014 20:56:35 +0000 (20:56 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 29 Sep 2014 20:56:35 +0000 (20:56 +0000)
commite6feecb1837d84a5d529b1ac07c1a5167f8aac30
tree383bfb90e1940881c4f125f4b595ef1d2ad44e5a
parent9ba0c69e53846778c7578ea7b78982ca706c2645
parent4aa14f03551fafee2b87eccbc4dafee04d46a9b8
am 4aa14f03: (-s ours) am b5071e4a: (-s ours) am 4802efe1: (-s ours) Import translations. DO NOT MERGE

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