| commit | c8a4babe93e4fd0cecb6b91a020b9252ac426004 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Feb 23 13:55:42 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Feb 23 13:55:42 2015 +0000 |
| tree | 8c7f309be6c6cb6fed17837c1ee688d643023360 | |
| parent | 85f270f69c9e99bf11947744e5b5091bba5e093c [diff] | |
| parent | 5211dfd5b49b4e0ed1dbd6bb06e3f96244b55134 [diff] |
am 5211dfd5: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev * commit '5211dfd5b49b4e0ed1dbd6bb06e3f96244b55134': Import translations. DO NOT MERGE