| commit | 1ceb0f2ea4e7bb11127e8360ca7e74c862500e18 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 06 18:36:44 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 06 18:36:44 2014 +0000 |
| tree | 1f0328f9a72792e081cd42df421c8f4c0f2f0803 | |
| parent | f9c11d904f46bb325627ff049fd4e8295c236475 [diff] | |
| parent | 88bc51ffcab7c636b5d0b2f8f309b20c6321e89b [diff] |
am 88bc51ff: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '88bc51ffcab7c636b5d0b2f8f309b20c6321e89b': Import translations. DO NOT MERGE