OSDN Git Service

Merge "SF: Also edit currentState in doTransaction" into nyc-dev
authorPablo Ceballos <pceballos@google.com>
Mon, 6 Jun 2016 19:37:38 +0000 (19:37 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 6 Jun 2016 19:37:38 +0000 (19:37 +0000)
commitd21cb6d2d9a5819c3427df1be4470bcc8baf3c6a
treea9bc50e8446e138cbea22c30febc0dbd3656bc39
parentfbcc332c85cb856633d72088a65f55277f5fee23
parentd224e6111bf4532fb1c1fc021c20285b38bc80ec
Merge "SF: Also edit currentState in doTransaction" into nyc-dev
am: d224e6111b

* commit 'd224e6111bf4532fb1c1fc021c20285b38bc80ec':
  SF: Also edit currentState in doTransaction

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