tree b162b3d78cb757bf6ba7b52e356e71452220cb56
parent 915c02c96ab9322377d0bb987ce8f2831e21eb0b
parent 07a21754f45672b27e765d8c7677c9663c6dce91
author Seigo Nonaka <nona@google.com> 1503017355 +0000
committer android-build-merger <android-build-merger@google.com> 1503017355 +0000

Merge "Fix race condition of removing surface." into oc-dev
am: 07a21754f4

Change-Id: I1358805c52332bc79810117a6d0407273cae0ed7