Merge "Allow the window to be recreated in the middle of a test am: 30ef1bf331 am...
authorAndroid Build Merger (Role) <noreply-android-build-merger@google.com>
Mon, 30 Apr 2018 19:58:08 +0000 (19:58 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 30 Apr 2018 19:58:08 +0000 (19:58 +0000)

Trivial merge