am 1cd71b54: (-s ours) am c2db3586: (-s ours) am e6841c13: (-s ours) Import translati...
authorGeoff Mendal <mendal@google.com>
Thu, 27 Aug 2015 22:04:00 +0000 (22:04 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 22:04:00 +0000 (22:04 +0000)
commite3ccd2f3d996bdd0e762a80c6761e6fc1f99afd9
treeb99d11616c7fafa687a9002e666aa3a0d6ca85ab
parente41f3e370c6c4c5bbb490ec21ee64920d6313552
parent1cd71b54b65646f1eb8bff99d5bb13e156fc4af3
am 1cd71b54: (-s ours) am c2db3586: (-s ours) am e6841c13: (-s ours) Import translations. DO NOT MERGE

* commit '1cd71b54b65646f1eb8bff99d5bb13e156fc4af3':