| commit | 7adbdd5b00efa5cde1b3d446888a9b3142051bf7 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Mar 18 18:24:08 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Mar 18 18:24:08 2015 +0000 |
| tree | 2c865b98b8cb52f3faa81f149b99f1467789d3d6 | |
| parent | a6b490e21d7987371484b01e1b82caa964b381f1 [diff] | |
| parent | b9b1124cd7cd1109068d8bba1cf3a35c1626f32f [diff] |
am b9b1124c: (-s ours) am ac8641ed: (-s ours) Import translations. DO NOT MERGE * commit 'b9b1124cd7cd1109068d8bba1cf3a35c1626f32f': Import translations. DO NOT MERGE