[automerger] Allow the window to be recreated in the middle of a test am: 30ef1bf331...
authorAndroid Build Merger (Role) <noreply-android-build-merger@google.com>
Mon, 30 Apr 2018 19:33:00 +0000 (19:33 +0000)
committerAndroid Build Merger (Role) <noreply-android-build-merger@google.com>
Mon, 30 Apr 2018 19:33:00 +0000 (19:33 +0000)
Change-Id: Ic5dc053bb7ea5d82429b4acaa54063c042049e52


Trivial merge