OSDN Git Service

resolved conflicts for 31e5ded6 to master
authorSergio Giro <sgiro@google.com>
Thu, 1 Oct 2015 11:14:03 +0000 (12:14 +0100)
committerSergio Giro <sgiro@google.com>
Thu, 1 Oct 2015 11:19:34 +0000 (11:19 +0000)
commitf236d7ffadd918a2a50f7cbd04349ad2222644b7
tree8ae575dfa5b531898dc3a10170a40a1769dff03d
parentf8f9c10247b32c0075f0e0e30c1f38d7a61a030d
parent31e5ded687bd5307bc614d6ec0a56888b98a0306
resolved conflicts for 31e5ded6 to master

Change-Id: Iae4e1abe697f1c00a82b54c17afa7d4edddc006b
libs/hwui/DeferredDisplayList.cpp
libs/hwui/DeferredDisplayList.h