| commit | 7e760e5f9c08555c9abeafcc3ab988710df238b4 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Mar 16 13:10:47 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 16 13:10:47 2015 +0000 |
| tree | 2c865b98b8cb52f3faa81f149b99f1467789d3d6 | |
| parent | 79e7d1747ffde2a70fc709915c55f6e149d879e4 [diff] | |
| parent | d28b6bae2491145241eb4e3a3384ed059f615234 [diff] |
am d28b6bae: (-s ours) am 01492de4: (-s ours) Import translations. DO NOT MERGE * commit 'd28b6bae2491145241eb4e3a3384ed059f615234': Import translations. DO NOT MERGE