| commit | 08dcb051b17c29578c2f9b9c5267476c57b5c646 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Nov 26 20:11:28 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 26 20:11:28 2014 +0000 |
| tree | c5b4127565696de79776a1cfcd534840316220cd | |
| parent | 1f04def9e83e8232d7460d2755aef53b74803331 [diff] | |
| parent | 38187407384e65832335ac3592744cd4827fd5b7 [diff] |
am 38187407: (-s ours) am 1f52dcb1: (-s ours) Import translations. DO NOT MERGE * commit '38187407384e65832335ac3592744cd4827fd5b7': Import translations. DO NOT MERGE