| commit | b0bbc61d8dfdd27d7320727fa95a27f8456e3b75 | [log] [tgz] |
|---|---|---|
| author | Jeff Brown <jeffbrown@google.com> | Fri Mar 27 01:49:56 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 27 01:49:56 2015 +0000 |
| tree | 906bd5d91c6725b9bbdc39b90a35425d09f45796 | |
| parent | 6ea6d48213b92df92e3f2e83861d5785f9d8fc0b [diff] | |
| parent | 833ed282e17ad20ff79ef6391c43c8b6b2af61ea [diff] |
am 833ed282: am 16869c8e: am a15ce03e: am 64646def: am d6216305: Merge "Disable more hotkeys while in setup." into lmp-mr1-dev * commit '833ed282e17ad20ff79ef6391c43c8b6b2af61ea':