| commit | edc6444af72f83a84e5215fc4eee4498f7a11b0d | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jan 19 15:28:11 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jan 19 15:28:11 2015 +0000 |
| tree | a36307776fba88e5b00b9d547ca9b07194d4ae31 | |
| parent | 80b03b607a09da452fabb9b4f311904a7457e00d [diff] | |
| parent | f7282d213ab2666471c2ffafe5e0e9c3dc144bbe [diff] |
am f7282d21: (-s ours) am e7b79f16: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev * commit 'f7282d213ab2666471c2ffafe5e0e9c3dc144bbe': Import translations. DO NOT MERGE