Allow the window to be recreated in the middle of a test am: 30ef1bf331
authorLloyd Pique <lpique@google.com>
Mon, 30 Apr 2018 19:30:50 +0000 (12:30 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 30 Apr 2018 19:30:50 +0000 (12:30 -0700)
am: 38611cff1b

Change-Id: Ib6b7ff02fe67679472877a9cc5dff04f7d01a17a


Trivial merge