diff options
author | John Spurlock <jspurlock@google.com> | 2013-11-04 21:54:33 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-04 21:54:33 -0800 |
commit | dd0e636eb24a0cc1eab9fbd38ee0abeceb848bb4 (patch) | |
tree | 4ada036c9dd9939da537311d201ca30a67e0378a /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 5f4a89480a6f5d3eb6ec7f7979f6555ae083c25f (diff) | |
parent | 7755e39f58b2629a21f4a0eb30da24c92979ead2 (diff) |
am 7755e39f: am 8f42b4e8: Merge "Don\'t clear the interacting bit if panel handled touch." into klp-dev
* commit '7755e39f58b2629a21f4a0eb30da24c92979ead2':
Don't clear the interacting bit if panel handled touch.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions