| commit | 5312261de76661827eae1915bcf4d42fa36309b0 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Apr 27 12:48:14 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Apr 27 12:48:14 2015 +0000 |
| tree | 9b98388e7fb6b7700f7068d26c6d7a2b584ef399 | |
| parent | 23562e4605de230ffa35944f1865f55c388c818a [diff] | |
| parent | 3eb3af9daabe58ca117d0f8b14f86117d8b96458 [diff] |
am 3eb3af9d: (-s ours) am c5184ff1: (-s ours) Import translations. DO NOT MERGE * commit '3eb3af9daabe58ca117d0f8b14f86117d8b96458': Import translations. DO NOT MERGE