tree 69f1929304b224494121d8e592078f269028e1f3
parent ec3a88dee2c7d77c09eaad0c297f077744033d48
parent 944c985b4199e6e029568ea87004c9727e469cc0
author Jeff Brown <jeffbrown@google.com> 1323469538 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1323469538 -0800

am 944c985b: am e0e9fd98: Merge "Fix system hotkey handling." into ics-mr1

* commit '944c985b4199e6e029568ea87004c9727e469cc0':
  Fix system hotkey handling.