| commit | 833ed282e17ad20ff79ef6391c43c8b6b2af61ea | [log] [tgz] |
|---|---|---|
| author | Jeff Brown <jeffbrown@google.com> | Fri Mar 27 01:24:16 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 27 01:24:16 2015 +0000 |
| tree | 79653f9a4b50764aab7a13a59ef87c7c68a1d9ad | |
| parent | 9b25b77feb09119710713a81978dbbcdcb2f0c40 [diff] | |
| parent | 16869c8e25a7dbafb1c0aed29f2bd8e164fa9b67 [diff] |
am 16869c8e: am a15ce03e: am 64646def: am d6216305: Merge "Disable more hotkeys while in setup." into lmp-mr1-dev * commit '16869c8e25a7dbafb1c0aed29f2bd8e164fa9b67':