diff options
| author | Adam Powell <adamp@google.com> | 2010-10-07 12:23:20 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-07 12:23:20 -0700 |
| commit | 1b93c0ab559ada94c85acc8231ed4fbd23318b8b (patch) | |
| tree | 07422a81d8328815f5707f67c51ee939abb2436d /libs/rs/rsg_ScriptJavaClass.cpp | |
| parent | cd1093c267e7ddcda19f68561288191e6a4d5837 (diff) | |
| parent | ee7e0efcc1314b994ba70d91f6e8fa951044c916 (diff) | |
am ee7e0efc: (-s ours) am 59c4cb9e: Merge "DO NOT MERGE Fix bug 3001751 and bug 3001584 - Gingerbread API review for over-scroll" into gingerbread
Merge commit 'ee7e0efcc1314b994ba70d91f6e8fa951044c916'
* commit 'ee7e0efcc1314b994ba70d91f6e8fa951044c916':
DO NOT MERGE Fix bug 3001751 and bug 3001584 - Gingerbread API review for over-scroll
Diffstat (limited to 'libs/rs/rsg_ScriptJavaClass.cpp')
0 files changed, 0 insertions, 0 deletions