summaryrefslogtreecommitdiff
path: root/libs/rs/rsg_ScriptJavaClass.cpp
diff options
context:
space:
mode:
authorAdam Powell <adamp@google.com>2010-10-05 16:46:05 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-05 16:46:05 -0700
commitee7e0efcc1314b994ba70d91f6e8fa951044c916 (patch)
tree2b6e45903190cb26c1af272cda6cd2cdd8cbcdd1 /libs/rs/rsg_ScriptJavaClass.cpp
parent65e8b476245255a96faaa70872a4196763a95e10 (diff)
parent59c4cb9e8fee03f770aa0fa1a2f0ec84ffb945b8 (diff)
am 59c4cb9e: Merge "DO NOT MERGE Fix bug 3001751 and bug 3001584 - Gingerbread API review for over-scroll" into gingerbread
Merge commit '59c4cb9e8fee03f770aa0fa1a2f0ec84ffb945b8' into gingerbread-plus-aosp * commit '59c4cb9e8fee03f770aa0fa1a2f0ec84ffb945b8': 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