commit | 5ed74fab8deba69018b9a6f135c2eda2969f986b | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Mon Jul 06 16:02:50 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 06 16:02:50 2015 +0000 |
tree | b821b52bc74cb4daf0fe0e15430bf702ca7c3e7a | |
parent | be89e964f06d89cc6455696c3d3ff990aee8d604 [diff] | |
parent | 45f672cb0f25c9840fec4c09a4bdba1d93986329 [diff] |
am 5b39ed29: (-s ours) am 633a69c3: (-s ours) am f9f18cb5: (-s ours) am 5330ed16: (-s ours) am 37029d3a: (-s ours) Import translations. DO NOT MERGE * commit '5b39ed29b26804cef0ab0cb25eff58a72209ea5f': Import translations. DO NOT MERGE