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

Change-Id: I1e1fa53e337ad527648c406eeb3b81b8bbba74d9


Trivial merge