Merge "Modify the case in adjustFocus when the mFocusedActivity is null" am:...
Merge "Modify the case in adjustFocus when the mFocusedActivity is null" am: 80587da3 am: 93c75d07 am: d975003a
am: 167f01a1 -s ours
Change-Id: I218c0eae30e8279284792e9e3fe119ee879b1826