| commit | 4808bdb0119cc6e850b9954f9fbf42efa6ed90bc | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 15 17:34:43 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 17:34:43 2015 +0000 |
| tree | 35bb7fb721b11264c812f8e975b51ebc854b5fe9 | |
| parent | 656fea968ef03af9e9505d9d010a787a261d333f [diff] | |
| parent | 895e581eb1f8a544959b71baa87e26ca5d6a7478 [diff] |
am 895e581e: (-s ours) am 521e442b: (-s ours) am 040b8559: (-s ours) Import translations. DO NOT MERGE * commit '895e581eb1f8a544959b71baa87e26ca5d6a7478': Import translations. DO NOT MERGE