| commit | fe20010aa4cc5410f6c9401d168ab37c8582f8c0 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Tue Nov 04 01:19:07 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 04 01:19:07 2014 +0000 |
| tree | 756268658d3a4348a1467fdeb2596598ac837445 | |
| parent | 4bef81095dbc9cedec8d9db1b58618f2441bd2a3 [diff] | |
| parent | 1fa5fe298b843116baa40060677daa573f975e4a [diff] |
am 1fa5fe29: (-s ours) am 9fe9a884: (-s ours) Import translations. DO NOT MERGE * commit '1fa5fe298b843116baa40060677daa573f975e4a': Import translations. DO NOT MERGE