| commit | 7f6a191e6e293181a081e22b8fa43bd9799bfec2 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Nov 17 22:54:21 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 17 22:54:21 2014 +0000 |
| tree | f9995dc51eee0a27f418f4e32316c9a82f7c2a7e | |
| parent | f75301f7b1c75207824fd7d9aab0f5936cb6e3ed [diff] | |
| parent | df944b30c2b2c69d7335b8a52959c05ed84e6fb1 [diff] |
am df944b30: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev * commit 'df944b30c2b2c69d7335b8a52959c05ed84e6fb1': Import translations. DO NOT MERGE