OSDN Git Service

Merge changes I87a57825,I3721d163 into oc-dev
authorTreeHugger Robot <treehugger-gerrit@google.com>
Fri, 2 Jun 2017 20:33:50 +0000 (20:33 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 2 Jun 2017 20:33:51 +0000 (20:33 +0000)
commite44ea13766f9a92c43c01f064b974b6a8dbf5c03
tree650c963907da3d440e59afd409cca431d4ed341d
parent2153f5e317b431f5efe78cad787788c2d0b8ea1d
parent41b08b5e97b04d726fb8bbacddbce563a1c890f9
Merge changes I87a57825,I3721d163 into oc-dev

* changes:
  SurfaceFlinger: Fix final cropping of child layers.
  SurfaceFlinger: Update parent pointer while performing transaction.