| commit | 7b43f3a2cbabdf9e23f27e5b77fa18d6911e4478 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Mar 02 14:00:22 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 02 14:00:22 2015 +0000 |
| tree | 28074b5ac05e56d80c71b69d15ecb13593c63670 | |
| parent | c9faf353d595e1af9905c0577ae326be8a04cf29 [diff] | |
| parent | 3f27483fc0d85ed91806029b491183428c1a5c01 [diff] |
am 3f27483f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev * commit '3f27483fc0d85ed91806029b491183428c1a5c01': Import translations. DO NOT MERGE