| commit | a3f384d249517cee9646aa7c5d48ef85dd8cc26c | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Fri Jun 19 16:15:38 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 19 16:15:38 2015 +0000 |
| tree | c082b222be191982c026acbaf5f2a8a438081d86 | |
| parent | 406885194c41affde16ee4141cb1ae41760e1af2 [diff] | |
| parent | b005f239cbb9f61c2cff7990b09105933baab949 [diff] |
am b005f239: (-s ours) am af7d8bbd: (-s ours) Import translations. DO NOT MERGE * commit 'b005f239cbb9f61c2cff7990b09105933baab949': Import translations. DO NOT MERGE