am 1b1c5777: (-s ours) am 7460b6e0: (-s ours) Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Wed, 29 Oct 2014 07:00:59 +0000 (07:00 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 29 Oct 2014 07:00:59 +0000 (07:00 +0000)
commitfa40889f1034b221489903d80d9f12337f9f0320
tree423790d8126acd6beee6ef43e62eb651e0265fda
parentab4caf4f714b141a601b8b45c9262c923183c577
parent1b1c5777ba1f828810ecea762afa9e0e462f0ad9
am 1b1c5777: (-s ours) am 7460b6e0: (-s ours) Import translations. DO NOT MERGE

* commit '1b1c5777ba1f828810ecea762afa9e0e462f0ad9':