| commit | 16869c8e25a7dbafb1c0aed29f2bd8e164fa9b67 | [log] [tgz] |
|---|---|---|
| author | Jeff Brown <jeffbrown@google.com> | Fri Mar 27 01:09:22 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 27 01:09:22 2015 +0000 |
| tree | bba39a27c2dabdfdedb73c5f3018ebda5762eb5a | |
| parent | d641bb009912818a1eb68bb46bfaf3af08318ea7 [diff] | |
| parent | a15ce03ee716be8b59965e0aeb6e6fcb23a8c237 [diff] |
am a15ce03e: am 64646def: am d6216305: Merge "Disable more hotkeys while in setup." into lmp-mr1-dev * commit 'a15ce03ee716be8b59965e0aeb6e6fcb23a8c237':