| commit | 42f19898136bdf07fc38586d70a6f14711997864 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Nov 12 23:40:29 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 12 23:40:29 2014 +0000 |
| tree | 7d20c822a038d62147edd85996ef8c7ed9196aab | |
| parent | eec3345421fcfdecd0952f9f42fc2b0a99d8bdba [diff] | |
| parent | 7ce22c58d97e7eb2fe86d8329456702beaca7f62 [diff] |
am fcbba83a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev * commit 'fcbba83aa2aaa04b3fd8a7b8cb5182b787841181': Import translations. DO NOT MERGE