| commit | 4d3109859d5a8716f5701144696c46ce72633e84 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jul 13 15:31:36 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 13 15:31:36 2015 +0000 |
| tree | d14ba40cf46738e40d7947a078dd587dfb440fba | |
| parent | 37e1df349aa76d79dca0c379ab1768dcec50ea94 [diff] | |
| parent | 7ee8a992ecd703b84938f54860801254d2b47924 [diff] |
am 7ee8a992: (-s ours) am a187be6a: (-s ours) Import translations. DO NOT MERGE * commit '7ee8a992ecd703b84938f54860801254d2b47924': Import translations. DO NOT MERGE