| commit | f2932c2f86f6ec28a3cf57d6ab06595dd74d2a8a | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Oct 16 03:33:40 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 16 03:33:40 2014 +0000 |
| tree | 2296251a090cfd0e5d49d96250a25158fba58332 | |
| parent | bba4bcf0b15f3675d07373919eb23027a94949c9 [diff] | |
| parent | a2ac1ade830e71a4806186f5226bb9f956f668fb [diff] |
am a2ac1ade: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev * commit 'a2ac1ade830e71a4806186f5226bb9f956f668fb': Import translations. DO NOT MERGE