diff options
| author | Adam Powell <adamp@google.com> | 2010-10-14 15:28:50 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-14 15:28:50 -0700 |
| commit | 45a2033ce9831cb2de0ee924519c768b496510ae (patch) | |
| tree | 49f4a0ad94f5ef3582a601b69dcbbc920019dab7 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 3a64f241fe792cadbe0df7e592389f7d90f88fc1 (diff) | |
| parent | 2b87dbc3b89f19bd5cde58b2b178cb7be50d77f9 (diff) | |
am 2b87dbc3: (-s ours) am c417612a: Merge "Fix bug 3083631 - Links no longer get tapped during scale gestures" into gingerbread
Merge commit '2b87dbc3b89f19bd5cde58b2b178cb7be50d77f9'
* commit '2b87dbc3b89f19bd5cde58b2b178cb7be50d77f9':
Fix bug 3083631 - Links no longer get tapped during scale gestures
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions