summaryrefslogtreecommitdiff
path: root/libs/hwui/OpenGLRenderer.cpp
diff options
context:
space:
mode:
author Bryce Lee <brycelee@google.com> 2015-02-06 19:42:38 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-02-06 19:42:38 +0000
commita20e430d0ab8c65e392491b6d299a821c4bed50e (patch)
treef9a946f3cf4675e1c2a956c50d05b145806d2fc9 /libs/hwui/OpenGLRenderer.cpp
parenta5669730d0910d278fbff062c700cc43ae3c9c39 (diff)
parent13c7044186b90f7f63e7a17996222edfb18460f5 (diff)
am 13c70441: Merge "Revert "Expose userActivityTimeout through @SystemApi getter/setter."" into lmp-mr1-modular-dev
* commit '13c7044186b90f7f63e7a17996222edfb18460f5': Revert "Expose userActivityTimeout through @SystemApi getter/setter."
Diffstat (limited to 'libs/hwui/OpenGLRenderer.cpp')
0 files changed, 0 insertions, 0 deletions