diff options
| author | Mindy Pereira <mindyp@google.com> | 2010-10-04 10:20:47 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-04 10:20:47 -0700 |
| commit | 94e461309b5f6ad0a66508aa1c33330ec9ae13db (patch) | |
| tree | 89b9d1f34e4ccbba4ef98dfea8f3f8911dcc8b3d /graphics/java/android/renderscript/RenderScript.java | |
| parent | c0ed31d7a9f6d6b788635429c20d0f6fa47418de (diff) | |
| parent | 53fb09b42f8862650f959c30c1ab104142fa873a (diff) | |
am 53fb09b4: (-s ours) am 106950f2: Merge "DO NOT MERGE. Fix logic for switching between overscroll and scroll modes." into gingerbread
Merge commit '53fb09b42f8862650f959c30c1ab104142fa873a'
* commit '53fb09b42f8862650f959c30c1ab104142fa873a':
DO NOT MERGE. Fix logic for switching between overscroll and scroll modes.
Diffstat (limited to 'graphics/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions