983e5f2cd3
Merge commit '96ef9f68a43604c99cd18537a6c8e9d1c5049c31' * commit '96ef9f68a43604c99cd18537a6c8e9d1c5049c31': fix 2460740 com.android.launcher2: java.lang.NullPointerException at