OSDN Git Service

Merge changes I23e6f088,I800208e8,I55123a7a into oc-dr1-dev am: 607b5d1b40
authorDan Stoza <stoza@google.com>
Fri, 14 Jul 2017 20:48:46 +0000 (20:48 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 14 Jul 2017 20:48:46 +0000 (20:48 +0000)
commit3da6f353c93121132475f46f070cecdce99843c7
tree974f33b095b4ffb58a6bb645feaae2347fc9fdcb
parent53b2c53d976bcc5d8d7bd1be702a723278cfdb49
parent1042a22877c8c38b50c0c656d8c02f50b996f7a7
Merge changes I23e6f088,I800208e8,I55123a7a into oc-dr1-dev am: 607b5d1b40
am: 1042a22877

Change-Id: I4c5e092f7119fb9a90e791dd31fbdb4f56b811cd
services/surfaceflinger/SurfaceFlinger.cpp