Merge "Lock in Surface#destroy" into tm-dev am: 1559113427 am: a4844e15aa
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18283681 Change-Id: I19be0116ddbe1a3e6bf6659569c890d2a5c45f66 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: