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

Change-Id: I60c1f1fab6359a7036d1f51fd879abb1c5fa9b20


Trivial merge