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