summaryrefslogtreecommitdiff
path: root/libs/rs/rsProgram.cpp
diff options
context:
space:
mode:
author Adam Powell <adamp@google.com> 2010-06-23 12:41:46 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-06-23 12:41:46 -0700
commitc047b956360a2476793b38d9d3e996fed941af8b (patch)
tree927ade0415a1a61e27b9b19ffa478dbe0b2fbff9 /libs/rs/rsProgram.cpp
parent1150dac07a2b144640795514a986403370257063 (diff)
parentbc337d2f675e8417be5534439e1b4ed1bc45a9c7 (diff)
am bc337d2f: am 73ccafb5: Merge "Fix a bug where requestDisallowInterceptTouchEvent does not get called when scrolling is resumed after stopping a fling." into gingerbread
Merge commit 'bc337d2f675e8417be5534439e1b4ed1bc45a9c7' * commit 'bc337d2f675e8417be5534439e1b4ed1bc45a9c7': Fix a bug where requestDisallowInterceptTouchEvent does not get called
Diffstat (limited to 'libs/rs/rsProgram.cpp')
0 files changed, 0 insertions, 0 deletions