tree a71c8051c157a8c1188e53ad9fa7564891e0b107
parent 2110a28a6c7ef7d7802028d0a2dd9c14ceb432e1
parent 619ce1ce534775ab0ff4d591a69dafd53c04a315
author Jeff Brown <jeffbrown@google.com> 1426890941 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426890941 +0000

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

* commit '619ce1ce534775ab0ff4d591a69dafd53c04a315':
  Disable more hotkeys while in setup.