| commit | bcd7a52ead45418042a9b37a2a75fad09ac6bd78 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Tue Nov 25 15:08:52 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 25 15:08:52 2014 +0000 |
| tree | cfc4dabf05af2268cc0c3bb773939e8a7a315809 | |
| parent | 40ac65447bc9c7cf4f1b88ddde921fabb2448fe6 [diff] | |
| parent | 41d3e943a7245c4a95095027a52224acef174758 [diff] |
am 41d3e943: (-s ours) am ae71b002: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '41d3e943a7245c4a95095027a52224acef174758': Import translations. DO NOT MERGE