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