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:44:30 +0000 (12:44 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 30 Apr 2018 19:44:30 +0000 (12:44 -0700)
am: 5f0bdcf623

Change-Id: I4d05bd26ddde90158c564156ce4349696cc78489


Trivial merge