| commit | 207c828e8e728c41851f210a04415d678bb62c3b | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 13 19:09:09 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 13 19:09:09 2014 +0000 |
| tree | 24cee94ab622f8febd88367d94a2c7b39edf8bf6 | |
| parent | d13c86f4823ebf85c06669dd272766afc357e714 [diff] | |
| parent | fd169d1ef698992444b785617a1da1df40059bd6 [diff] |
am fd169d1e: (-s ours) am 3c68bde1: (-s ours) am ce9003f7: (-s ours) am 1b77f365: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev * commit 'fd169d1ef698992444b785617a1da1df40059bd6': Import translations. DO NOT MERGE