| commit | 50f8944c200e20e6a387e2cade03865ae95368ec | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jul 13 12:47:42 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 13 12:47:42 2015 +0000 |
| tree | c9275076b6c33e40432194097d82ad5a40d77bf6 | |
| parent | 45289c3d39d24b7530e4478af0120da4a21e2744 [diff] | |
| parent | 1ac1ac74af7007eb7351eb60c832e1f405252f34 [diff] |
am 1ac1ac74: (-s ours) Import translations. DO NOT MERGE * commit '1ac1ac74af7007eb7351eb60c832e1f405252f34': Import translations. DO NOT MERGE