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

Change-Id: I9347f789b79bf1bbcb128aab72ff4e62a662537a


Trivial merge