am b4f1c7f1: (-s ours) am eb140c18: (-s ours) Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Wed, 29 Oct 2014 07:00:58 +0000 (07:00 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 29 Oct 2014 07:00:58 +0000 (07:00 +0000)
commitc11548ea62820a1f5fbbc0a60ae254f7de6247a6
tree423790d8126acd6beee6ef43e62eb651e0265fda
parent756eae438fda5154b3416dd081c6a5f0a6e99a31
parentb4f1c7f17429dec5683447f8bf9674da6feb70d0
am b4f1c7f1: (-s ours) am eb140c18: (-s ours) Import translations. DO NOT MERGE

* commit 'b4f1c7f17429dec5683447f8bf9674da6feb70d0':