tree 650c963907da3d440e59afd409cca431d4ed341d
parent 2153f5e317b431f5efe78cad787788c2d0b8ea1d
parent 41b08b5e97b04d726fb8bbacddbce563a1c890f9
author TreeHugger Robot <treehugger-gerrit@google.com> 1496435630 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1496435631 +0000

Merge changes I87a57825,I3721d163 into oc-dev

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