commit | a15ce03ee716be8b59965e0aeb6e6fcb23a8c237 | [log] [tgz] |
---|---|---|
author | Jeff Brown <jeffbrown@google.com> | Fri Mar 27 00:49:33 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 27 00:49:33 2015 +0000 |
tree | b9577e53ed3ed26ecf377495afb2216f28c014c0 | |
parent | 9001f14b205aba4d9fa236611b122492b92d3b4a [diff] | |
parent | 64646defa7d01ca4105a5da8cc8d0999dac1543d [diff] |
am 64646def: am d6216305: Merge "Disable more hotkeys while in setup." into lmp-mr1-dev * commit '64646defa7d01ca4105a5da8cc8d0999dac1543d':