am 5fbd02c3: (-s ours) am a4a4b85d: (-s ours) am 6ed30705: (-s ours) Import translati...
authorBaligh Uddin <baligh@google.com>
Fri, 18 Sep 2015 17:34:48 +0000 (17:34 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 18 Sep 2015 17:34:48 +0000 (17:34 +0000)
commit53da66c37d53b9d389d961422abc699cb54805c9
tree32dc7bf958845e97f12edfa6cf6f32a665c43e58
parent698dd81e89b7317c93302fd3d4b1f67b839e303a
parent5fbd02c3c38ba51590b6f486c3d4025f446cc195
am 5fbd02c3: (-s ours) am a4a4b85d: (-s ours) am 6ed30705: (-s ours) Import translations. DO NOT MERGE

* commit '5fbd02c3c38ba51590b6f486c3d4025f446cc195':
  Import translations. DO NOT MERGE