| commit | 9e85a4bb2e08efcbc3226a20b33cf82725011e97 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Aug 27 11:28:49 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:28:49 2015 +0000 |
| tree | 59871c64c5226845932981ed9d60087822b662e6 | |
| parent | 7a50a11039d56b117a130784a5c22189c74f677f [diff] | |
| parent | 74b193c537907522b377e714e6ceb66ae46750ef [diff] |
am 74b193c5: (-s ours) am ae1c4b2c: (-s ours) Import translations. DO NOT MERGE * commit '74b193c537907522b377e714e6ceb66ae46750ef':