diff options
| author | Narayan Kamath <narayan@google.com> | 2014-10-29 12:12:37 +0000 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2014-10-29 12:12:37 +0000 |
| commit | 4ed472ab33e78391c0b084ed3908019e06b7dfe5 (patch) | |
| tree | 2135110bff4085ec90113a260f0a7eac519ba76b /libs/hwui/Layer.h | |
| parent | fa945c105b4f7bb3e3844e8ce467ca701d5f3a9f (diff) | |
| parent | 3028394c4691db9dec6bde04a7ed927e7501bd6a (diff) | |
resolved conflicts for merge of 3028394c to stage-aosp-master
Change-Id: I980e4c95cdc6a4778cef3298338692656d23e7c6
Diffstat (limited to 'libs/hwui/Layer.h')
| -rw-r--r-- | libs/hwui/Layer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/hwui/Layer.h b/libs/hwui/Layer.h index a8e1c2671064..b26459524c39 100644 --- a/libs/hwui/Layer.h +++ b/libs/hwui/Layer.h @@ -47,7 +47,7 @@ class RenderState; class OpenGLRenderer; class RenderNode; class DeferredDisplayList; -class DeferStateStruct; +struct DeferStateStruct; /** * A layer has dimensions and is backed by an OpenGL texture or FBO. |