OSDN Git Service

am d020fd33: Merge changes Ib18c99b9,I9f42eeb9 into klp-modular-dev
authorMichael Wright <michaelwr@google.com>
Sat, 29 Mar 2014 00:59:46 +0000 (00:59 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 29 Mar 2014 00:59:46 +0000 (00:59 +0000)
commit4669cfff1ed590087eade846aee8b4ef58f31739
treec395a1942cc7570add9036adbfb4d95998e8a0fb
parentf1354dd206a74e1475e8c1f8682dfd9d5e146f00
parentd020fd33d147c88a9cda4976d2fa559e55b4ab03
am d020fd33: Merge changes Ib18c99b9,I9f42eeb9 into klp-modular-dev

* commit 'd020fd33d147c88a9cda4976d2fa559e55b4ab03':
  Generate and respect ACTION_CANCEL for joystick fallbacks. DO NOT MERGE
  Adds API for determining confirm and cancel keys.
api/current.txt
core/java/android/view/View.java
libs/input/InputDispatcher.cpp