OSDN Git Service

Merge changes I87a57825,I3721d163 into oc-dev
authorRobert Carr <racarr@google.com>
Fri, 2 Jun 2017 20:44:36 +0000 (20:44 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 2 Jun 2017 20:44:36 +0000 (20:44 +0000)
commit25bc953ae3835923bfb8b9cdf68f651880aa2673
tree596e1e7de2bb0b937c40e5ef7f22c3d9c4528223
parent58858831457b2d1d0a5211c05e9da90019998ff1
parente44ea13766f9a92c43c01f064b974b6a8dbf5c03
Merge changes I87a57825,I3721d163 into oc-dev
am: e44ea13766

Change-Id: I258fd8dd5fd03975a28c606dcd022ef506554fb6
services/surfaceflinger/Layer.cpp