am 54fbb3a6: (-s ours) am e8137079: (-s ours) Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Sun, 6 Jul 2014 22:04:32 +0000 (22:04 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sun, 6 Jul 2014 22:04:32 +0000 (22:04 +0000)
commit21c12e8c01d9c9e8f3fefc9a7aa337d3036bac85
treec8c22b100ff97ee5406e23b498db15918c36a973
parent6de8911d35a912f3f51900a59cf796da925f2609
parent54fbb3a63e7dcb2afa9480e08263d8f0e991daee
am 54fbb3a6: (-s ours) am e8137079: (-s ours) Import translations. DO NOT MERGE

* commit '54fbb3a63e7dcb2afa9480e08263d8f0e991daee':
  Import translations. DO NOT MERGE