| commit | b92f64c6fdb1cfb49915596f060803a7ff0477ae | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Feb 12 23:05:04 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 12 23:05:04 2015 +0000 |
| tree | 3c7fbcbb6941c483dbceb6641866c3ec36186a33 | |
| parent | 26408bc823d78919ef90b11e67e276f06a27beb6 [diff] | |
| parent | 63ebe61dc8de2658d60828139c99f26a014e94f9 [diff] |
am 5c7e4d99: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev * commit '5c7e4d99402bf0440ebd6713b6680f8abea175a3': Import translations. DO NOT MERGE