tree 53a3235cb2b37701ee2a2445a08c39a3e460ef1f
parent 630ff318727280fc55eb2ed69019ed43f1802c93
parent d62163055f983b95a954f1a6c2cbc8e0085a7ab5
author Jeff Brown <jeffbrown@google.com> 1426889568 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426889568 +0000

am d6216305: Merge "Disable more hotkeys while in setup." into lmp-mr1-dev

* commit 'd62163055f983b95a954f1a6c2cbc8e0085a7ab5':
  Disable more hotkeys while in setup.