OSDN Git Service

Merge "SF: Don\'t pop pending state into mCurrentState" into nyc-dev
authorPablo Ceballos <pceballos@google.com>
Fri, 15 Apr 2016 18:38:04 +0000 (18:38 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 15 Apr 2016 18:38:04 +0000 (18:38 +0000)
commit6451ddb8f107b2fd57c956e74935ac62b91c8a2d
tree511697087b4a118469e2e1b95cef57b73a53e6a8
parente5fc9167630372c7527f95debe3fd32e3e40a19c
parent9eb286a074a8b2764b69339b0958dc5b176f1a8d
Merge "SF: Don\'t pop pending state into mCurrentState" into nyc-dev
am: 9eb286a

* commit '9eb286a074a8b2764b69339b0958dc5b176f1a8d':
  SF: Don't pop pending state into mCurrentState

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