diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2012-09-06 09:13:45 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-09-06 09:13:45 -0700 |
| commit | 7a6475220dbba9679fc15ef3fa92cd4f9f064615 (patch) | |
| tree | 9ff0f6759846b8870d74e0b8f05b91c3dd2c5ec6 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 32ac1e142c4a0f3529c49cde433ae5e22f84b1d6 (diff) | |
| parent | 1d9c5d8f18b7530c1e72fe86109707cddc198dbd (diff) | |
am 1d9c5d8f: (-s ours) Reconcile with jb-mr0-release jb-release - do not merge
* commit '1d9c5d8f18b7530c1e72fe86109707cddc198dbd':
Revert "Update Back softkey icon Bug: 6020915"
DO NOT MERGE GestureDetector - Mask action when checking POINTER_UP
DO NOT MERGE Remove dead code
DO NOT MERGE - Use focal point for scrolling in GestureDetector
DO NOT MERGE - New implementation for ScaleGestureDetector
Fix CDMA decoding of multipart UTF-16 SMS messages.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions