diff options
| author | Michael Wright <michaelwr@google.com> | 2014-03-29 00:59:46 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-29 00:59:46 +0000 |
| commit | 4669cfff1ed590087eade846aee8b4ef58f31739 (patch) | |
| tree | c395a1942cc7570add9036adbfb4d95998e8a0fb /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | f1354dd206a74e1475e8c1f8682dfd9d5e146f00 (diff) | |
| parent | d020fd33d147c88a9cda4976d2fa559e55b4ab03 (diff) | |
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.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions