Merge "Modify the case in adjustFocus when the mFocusedActivity is null" am: 80587da3c1 am: 93c75d07c1 am: d975003af3
am: 167f01a13a -s ours
Change-Id: I218c0eae30e8279284792e9e3fe119ee879b1826
This commit is contained in: