commit | 41d3e943a7245c4a95095027a52224acef174758 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Mon Nov 24 15:35:12 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 24 15:35:12 2014 +0000 |
tree | c5ee02fe285db2ca3a58eee086f907332b99770a | |
parent | c3ab889f9eda2a6307cc7ef82a626ec66522472a [diff] | |
parent | ae71b0027f5de71a947bc988ebd1c409e73063e0 [diff] |
am ae71b002: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit 'ae71b0027f5de71a947bc988ebd1c409e73063e0': Import translations. DO NOT MERGE