| commit | eef5734d96cd05deab581cdcfebc61533fc25cf6 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Fri Jan 16 20:52:29 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jan 16 20:52:29 2015 +0000 |
| tree | b738bcf77f6e9a65b048a36684ed59c454904b1c | |
| parent | 57653fc4a4f5f7e52719d2154fd2582ef8646e35 [diff] | |
| parent | 3891ce73206d4cf74c6aec1d5bf1b2b89fb90cb2 [diff] |
am 3891ce73: (-s ours) am 2c8e6daa: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '3891ce73206d4cf74c6aec1d5bf1b2b89fb90cb2': Import translations. DO NOT MERGE