tree 6f72baf867d4c97746fe3c8fe2baa73bd470924f
parent 104a29b6b5fe6e454787053ca72950dbbc4d424b
parent d62163055f983b95a954f1a6c2cbc8e0085a7ab5
author Jeff Brown <jeffbrown@google.com> 1426889454 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426889454 +0000

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

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