| commit | 42cc551f3920e2ed5214772c0f8105dd3db02830 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 13 13:15:32 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 13 13:15:32 2014 +0000 |
| tree | b16b116f716afd38dbe12b92f051aa497cd2d9df | |
| parent | 8d060560898f7b039532f3bd308a3f6f19960f0d [diff] | |
| parent | 6437cf60640bef6080b250eb1af42aaeefb4b830 [diff] |
am 6437cf60: (-s ours) am 7aa64f5c: (-s ours) Import translations. DO NOT MERGE * commit '6437cf60640bef6080b250eb1af42aaeefb4b830': Import translations. DO NOT MERGE