tree 50728362dae9386a3a17fba53c6879d7c1f5c21f
parent c1d180cd7b3f30fecd23a21f10bc242a8bc48d7f
parent 3c69948e6a2e84dd7130d2264463a7d6f13302a7
author Siarhei Vishniakou <svv@google.com> 1552053208 -0800
committer android-build-merger <android-build-merger@google.com> 1552053208 -0800

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

Change-Id: Ibeffcb78acdb9744993d3aec810acd27416ba455