am 507d2035: (-s ours) am 08b2636c: (-s ours) am 8f21bd29: (-s ours) am 35a5f7af...
authorBaligh Uddin <baligh@google.com>
Mon, 7 Jul 2014 17:52:20 +0000 (17:52 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 7 Jul 2014 17:52:20 +0000 (17:52 +0000)
commit0b9b957ed2daf8f8493ce9a63eb5f9b616ba3561
tree78b845bf79a7ca75a051966cc0b8e012427fdc6a
parent35d87b227c051bfdaa61b646de37cafd9cfee2c0
parent507d2035a31063856d9490d95307877ae996f2bb
am 507d2035: (-s ours) am 08b2636c: (-s ours) am 8f21bd29: (-s ours) am 35a5f7af: (-s ours) Import translations. DO NOT MERGE

* commit '507d2035a31063856d9490d95307877ae996f2bb':
  Import translations. DO NOT MERGE