diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2012-09-07 15:24:05 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-09-07 15:24:05 -0700 |
| commit | 330a5bf82e60fca9591f14a4db5ee98066c610d1 (patch) | |
| tree | c9aba6ed91620f8871396960ed372a65a5c25712 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 965e7ff4de117a9681b04e84573cb5924efdd6d9 (diff) | |
| parent | 2ff437745ec1e3463d4e7b831bf2b173aa38dad4 (diff) | |
am 2ff43774: (-s ours) Reconcile with jb-mr0-release - do not merge
* commit '2ff437745ec1e3463d4e7b831bf2b173aa38dad4':
DO NOT MERGE - Make WebView track focal points more accurately
DO NOT MERGE - Delay starting scale gesture events until a touch slop threshold
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions