tree f0187e26ff6ab99e3ea0089e9f839ff18ec27d7f
parent 825719bb92396e4853b8e84e065a2d1c8cd461c4
parent e6685b2bcdddd68087c02b9231cd19ccd75db3e0
author Seigo Nonaka <nona@google.com> 1500509056 +0000
committer android-build-merger <android-build-merger@google.com> 1500509056 +0000

Merge "Fix race condition of removing surface." into oc-dr1-dev
am: e6685b2bcd

Change-Id: I3677cb6f07b2a7c60e72b3f70034fec42adb6dec