| commit | 97c66ce52dc20a705f1d289ce1c3111ae936723c | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Jan 29 01:11:38 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 29 01:11:38 2015 +0000 |
| tree | 2ef54c527c645167369d27cd0bb02d6e59f4baa5 | |
| parent | 72e69bd96c8aa2bd689657a4fcd9a80736b980fc [diff] | |
| parent | 5bc30df7e03f9354a03d9a5f7819cd3bdae18201 [diff] |
am 5bc30df7: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '5bc30df7e03f9354a03d9a5f7819cd3bdae18201': Import translations. DO NOT MERGE