OSDN Git Service

Merge "Fix struct vs. class mismatch in forward definitions" am: 8cdcd15c38 am: 5c942...
authorColin Cross <ccross@android.com>
Wed, 28 Sep 2016 21:11:28 +0000 (21:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 28 Sep 2016 21:11:28 +0000 (21:11 +0000)
commit8bd2f6c499d1ced6170ca1af3b11a960815822ec
tree878a8c75cd65f619c4e599ca1cac4619f25f04ac
parentdb459af95a75cc34b7ef3bb4ebc4eb49675cc208
parentef2e1afdc23fc2dc04d488f704c03d22cc2085ab
Merge "Fix struct vs. class mismatch in forward definitions" am: 8cdcd15c38 am: 5c9421500e
am: ef2e1afdc2

Change-Id: I1656836e48b6092602c0a4bf8135084fe8da7df5
include/gui/ISurfaceComposer.h
include/gui/SurfaceComposerClient.h