| commit | 1c256387c3f5e5c3202d0db2393d8f89b68c6494 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 01 17:13:14 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 01 17:13:14 2015 +0000 |
| tree | b7860fdcbda2fa76d13b08f8fcff9398d9bea14e | |
| parent | 1ec6683407528349a1f540edd3a6cb5cd6ed7339 [diff] | |
| parent | 76abb934155519e40cfb3b500fefe37b57376993 [diff] |
am 76abb934: (-s ours) am c4ed0217: (-s ours) Import translations. DO NOT MERGE * commit '76abb934155519e40cfb3b500fefe37b57376993': Import translations. DO NOT MERGE