tree 8695bce37f8ac3bc8e5060f417d70eac5cef7610
parent f4df3d9523cc78474bedbd34e9aa3ac29e6f3d1f
parent bee3e01c9b552b57e956b221e86036cab52e92d1
author Siarhei Vishniakou <svv@google.com> 1552054429 -0800
committer android-build-merger <android-build-merger@google.com> 1552054429 -0800

Merge "Add a null check for getWindow()" am: 3c69948e6a am: 71f52a6a0d
am: bee3e01c9b

Change-Id: Iee9698396354eb0e0cacff759cc0dcef621ff514