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

Change-Id: I20efe4790094a717d9ec7d3c3fc5f71701dabe26


Trivial merge