summaryrefslogtreecommitdiff
path: root/libs/hwui/OpenGLRenderer.cpp
diff options
context:
space:
mode:
author Craig Mautner <cmautner@google.com> 2014-03-25 21:21:45 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2014-03-25 21:21:45 +0000
commit62143f2f17222f2a52928ef14597662982ff604d (patch)
tree5e2215e330f02f712aef78ac32b5909af114b36c /libs/hwui/OpenGLRenderer.cpp
parent2471abec78a29b5a7b9b9e3e6c061f4be0964e9a (diff)
parent1df9bc5c1d47a09b08d49287d81832e18674bece (diff)
am 1df9bc5c: am d7bf82d6: am f32b22e9: resolved conflicts for merge of ca903d38 to klp-modular-dev
* commit '1df9bc5c1d47a09b08d49287d81832e18674bece': Move task to top in window manager.
Diffstat (limited to 'libs/hwui/OpenGLRenderer.cpp')
0 files changed, 0 insertions, 0 deletions