am 4669cfff: (-s ours) am d020fd33: Merge changes Ib18c99b9,I9f42eeb9 into klp-modular-dev

* commit '4669cfff1ed590087eade846aee8b4ef58f31739':
  Generate and respect ACTION_CANCEL for joystick fallbacks. DO NOT MERGE
  Adds API for determining confirm and cancel keys.
This commit is contained in:
Michael Wright
2014-03-29 01:09:27 +00:00
committed by Android Git Automerger

Diff Content Not Available