summaryrefslogtreecommitdiff
path: root/libs/hwui/ProgramCache.h
diff options
context:
space:
mode:
author Andreas Huber <andih@google.com> 2010-07-30 12:20:56 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-07-30 12:20:56 -0700
commitf0ba841f74e719924dfef964254acb96b99089c5 (patch)
treee18988807e2a960d5df43b63c4a54e5691eff010 /libs/hwui/ProgramCache.h
parent994112e771f471983f1536d2236b42b4260a6663 (diff)
parent2a5db6d4b389a1fb24f43f18b4207a5fad5296ca (diff)
am 2a5db6d4: am 432c5b6c: am 7f9fe5fd: Merge "Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference." into froyo
Merge commit '2a5db6d4b389a1fb24f43f18b4207a5fad5296ca' * commit '2a5db6d4b389a1fb24f43f18b4207a5fad5296ca': Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference.
Diffstat (limited to 'libs/hwui/ProgramCache.h')
0 files changed, 0 insertions, 0 deletions