diff options
author | 2014-10-15 07:26:22 +0000 | |
---|---|---|
committer | 2014-10-15 07:26:22 +0000 | |
commit | 05fefb69758f5cf260cdf4ae374a3a4c519cf437 (patch) | |
tree | 3752cddfa28a70010decb53feb200bf21239c8a7 /libs/hwui/OpenGLRenderer.cpp | |
parent | 6449ba6d8c12747e74ab6d1fd0fa8730f4a5d512 (diff) | |
parent | 18279da701aff24dbf6c4aa5e76236a28d3425ea (diff) |
am 18279da7: am f55cdab4: resolved conflicts for merge of f9a924ab to lmp-mr1-dev
* commit '18279da701aff24dbf6c4aa5e76236a28d3425ea':
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