| commit | 0536f44faa16075b51ebaea0765a24e4fc0d5a6b | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 13 19:17:08 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 13 19:17:08 2014 +0000 |
| tree | 24cee94ab622f8febd88367d94a2c7b39edf8bf6 | |
| parent | 207c828e8e728c41851f210a04415d678bb62c3b [diff] | |
| parent | c98998a903cf79d502b29eaea81601cf185a0dfd [diff] |
am c98998a9: (-s ours) am fdb3d6d7: (-s ours) am 06f6b38b: (-s ours) am ad12f288: (-s ours) am 02c4a225: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit 'c98998a903cf79d502b29eaea81601cf185a0dfd': Import translations. DO NOT MERGE