diff options
| author | Michael Wright <michaelwr@google.com> | 2014-03-29 01:09:27 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-29 01:09:27 +0000 |
| commit | 16ff04ca38739350cf398c4081cfbf13cac33a9d (patch) | |
| tree | abc481bf338c81998cb5fea1d0b52a018e1b6da7 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 69a30b5e549e9da545e3545391e6027d9822e022 (diff) | |
| parent | 4669cfff1ed590087eade846aee8b4ef58f31739 (diff) | |
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.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions