OSDN Git Service

Merge "Modify the case in adjustFocus when the mFocusedActivity is null" am: 80587da3...
authorlei.peng <lei.peng@spreadtrum.com>
Fri, 14 Oct 2016 14:17:07 +0000 (14:17 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 14 Oct 2016 14:17:07 +0000 (14:17 +0000)
commit167f01a13a4231ba4a1991fab430f7be6df43bb4
treea9d591012b8d84d534c767e7b710c1f795c150a4
parent85f037acd00622caa214711619b25bc9844c582d
parentd975003af3e5b8365b2107fc9b6029b11ca9c88e
Merge "Modify the case in adjustFocus when the mFocusedActivity is null" am: 80587da3c1 am: 93c75d07c1
am: d975003af3

Change-Id: If4ff1ee251842598f1a5e8dedb7858daed201206
services/core/java/com/android/server/am/ActivityStack.java