OSDN Git Service

Merge "DO NOT MERGE Disable app pinning when emergency call button pressed" into...
authorHall Liu <hallliu@google.com>
Mon, 20 Jun 2016 21:04:41 +0000 (21:04 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 20 Jun 2016 21:04:43 +0000 (21:04 +0000)
commitfc32ec1aef6b11e9145252a25c3a5b2cb7f82696
tree0e20b55f82d2ad27873893955bbc35d18f045ea0
parentc61f35ed9a504dc81b16bc5cd98d49c58a99c8e4
parent209414015ccdcabedbcb7b7f54860b07ed7733c1
Merge "DO NOT MERGE Disable app pinning when emergency call button pressed" into mnc-dev
services/core/java/com/android/server/am/ActivityManagerService.java