summaryrefslogtreecommitdiff
path: root/libs/rs/rsScript.cpp
diff options
context:
space:
mode:
author Joe Onorato <joeo@google.com> 2010-10-19 09:53:47 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-10-19 09:53:47 -0700
commitf186dafdfe60d77c526c4e087655e8b257bc45cd (patch)
tree2104de54c5424cfe8bf33ed4f2e469c5663e68d7 /libs/rs/rsScript.cpp
parent5bc8c853f5f8118b172bb4651aba58fd254c3cb7 (diff)
parent5747eebf6eb5ea91480dc576c45c752685383e37 (diff)
am 5747eebf: am a8d477f0: Merge "Pressing the power button quickly needs to turn the screen on and off correctly." into gingerbread
Merge commit '5747eebf6eb5ea91480dc576c45c752685383e37' * commit '5747eebf6eb5ea91480dc576c45c752685383e37': Pressing the power button quickly needs to turn the screen on and off correctly.
Diffstat (limited to 'libs/rs/rsScript.cpp')
0 files changed, 0 insertions, 0 deletions