summaryrefslogtreecommitdiff
path: root/libs/hwui/OpenGLRenderer.cpp
diff options
context:
space:
mode:
author Filip Gruszczynski <gruszczy@google.com> 2015-07-01 17:13:40 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-07-01 17:13:40 +0000
commitcc7fa77e25e63b79a827816b7eea37bacedf5bff (patch)
treeb08a33313026207ee53509e820beb70ee35f2bab /libs/hwui/OpenGLRenderer.cpp
parent20ff6cd2581a6850b4df5939f96e394a898461be (diff)
parentd40c423b1cdccd61ed411b0b9e3fbefd47e99f9c (diff)
am d40c423b: Merge "resolved conflicts for merge of 300ccf4a to mnc-dev" into mnc-dev
* commit 'd40c423b1cdccd61ed411b0b9e3fbefd47e99f9c': Calculate outset hint when adding window.
Diffstat (limited to 'libs/hwui/OpenGLRenderer.cpp')
0 files changed, 0 insertions, 0 deletions