diff options
| author | 2014-11-07 11:29:08 -0800 | |
|---|---|---|
| committer | 2014-11-07 11:29:08 -0800 | |
| commit | 65f2defdfc35bfa485ca00dcf18ea817329a84be (patch) | |
| tree | a6fbfd457b369d1b3e13f2b473e75093808ee53d /libs/hwui/DeferredLayerUpdater.h | |
| parent | 03b16ae419a781076bcfaf735bb9917a60b95895 (diff) | |
| parent | cabf8a706474210f6afa13e7b288bb537351ad3d (diff) | |
resolve merge conflicts of cabf8a7 to master.
Change-Id: If0ca1c37d05f5dc471d88a3bf158dd68a1880bbf
Diffstat (limited to 'libs/hwui/DeferredLayerUpdater.h')
| -rw-r--r-- | libs/hwui/DeferredLayerUpdater.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/hwui/DeferredLayerUpdater.h b/libs/hwui/DeferredLayerUpdater.h index 6ccffe1b6118..ef385b97a242 100644 --- a/libs/hwui/DeferredLayerUpdater.h +++ b/libs/hwui/DeferredLayerUpdater.h @@ -75,7 +75,7 @@ public: ANDROID_API bool apply(); - ANDROID_API Layer* backingLayer() { + Layer* backingLayer() { return mLayer; } |