diff options
| author | Dan Albert <danalbert@google.com> | 2014-11-12 21:31:33 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-12 21:31:33 +0000 |
| commit | 45670c1dc55c3d853c03a252623428aeffa731e7 (patch) | |
| tree | f8aea770e319fae0b46673fe55e127aed8ef7be4 /libs/hwui/DisplayList.h | |
| parent | a41f29cc000680f402d51972dfad0a46c5a3cb07 (diff) | |
| parent | b28ff487fb6db4a44e4d18aa17d8253f00a63bb6 (diff) | |
| download | frameworks_base-45670c1dc55c3d853c03a252623428aeffa731e7.zip frameworks_base-45670c1dc55c3d853c03a252623428aeffa731e7.tar.gz frameworks_base-45670c1dc55c3d853c03a252623428aeffa731e7.tar.bz2 | |
am b28ff487: resolved conflicts for merge of 5e6cf242 to lmp-mr1-dev-plus-aosp
* commit 'b28ff487fb6db4a44e4d18aa17d8253f00a63bb6':
Move frameworks/base over to libc++.
Diffstat (limited to 'libs/hwui/DisplayList.h')
| -rw-r--r-- | libs/hwui/DisplayList.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/hwui/DisplayList.h b/libs/hwui/DisplayList.h index 9ede003..43dabdb 100644 --- a/libs/hwui/DisplayList.h +++ b/libs/hwui/DisplayList.h @@ -83,7 +83,7 @@ public: LinearAllocator * const mAllocator; SkPath* allocPathForFrame() { - mTempPaths.push_back(); + mTempPaths.push_back(SkPath()); return &mTempPaths.back(); } |