diff options
author | 2014-10-15 07:22:15 +0000 | |
---|---|---|
committer | 2014-10-15 07:22:15 +0000 | |
commit | 18279da701aff24dbf6c4aa5e76236a28d3425ea (patch) | |
tree | f0c2fdec2626525d4ed329bcbca3696fedec91f3 /libs/hwui/OpenGLRenderer.cpp | |
parent | 92ab2748efc185a347d11e1382d54b86ffd22799 (diff) | |
parent | f55cdab4bf9f9206d77748d0774065dc8438af0f (diff) |
am f55cdab4: resolved conflicts for merge of f9a924ab to lmp-mr1-dev
* commit 'f55cdab4bf9f9206d77748d0774065dc8438af0f':
DO NOT MERGE CEC: Queue actions for starting later when not ready
Diffstat (limited to 'libs/hwui/OpenGLRenderer.cpp')
0 files changed, 0 insertions, 0 deletions