| commit | e80017ab4422c67e2565e53869d0cfc6a70b966d | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Mar 02 14:30:00 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 02 14:30:00 2015 +0000 |
| tree | 28074b5ac05e56d80c71b69d15ecb13593c63670 | |
| parent | fdbfd3c995b132e60c8ee8644ad5759bd318928a [diff] | |
| parent | e467992236a40646d31a9171ecaac51b0d90fd9a [diff] |
am e4679922: (-s ours) am fe780774: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev * commit 'e467992236a40646d31a9171ecaac51b0d90fd9a': Import translations. DO NOT MERGE