tree 0d1f703b8610e3bae77e1c702fb147cfb49cf549
parent 39350847ffdc6f35a9d65a880a726f3c2101c803
parent c19279ef93628448fbfb142d85ff80a6ad230425
author Jeff Brown <jeffbrown@google.com> 1426890151 +0000
committer android-build-merger <android-build-merger@google.com> 1426890151 +0000

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

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