OSDN Git Service

Merge \\\"DO NOT MERGE Disable app pinning when emergency call button pressed\\\...
authorHall Liu <hallliu@google.com>
Mon, 20 Jun 2016 21:28:09 +0000 (21:28 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 20 Jun 2016 21:28:09 +0000 (21:28 +0000)
commitedace5e820c080ae4e826766ee47bda7cbefa0a7
treee029944cb629e44679f47d22e9e90eafbcdfbc74
parent790c87a05bca73bec63c72eb801c8fdd72a67124
parent317d0cb1695d63db19d1ed9f4e5cd1b39cbb26d3
Merge \\\"DO NOT MERGE Disable app pinning when emergency call button pressed\\\" into mnc-dev am: fc32ec1aef am: aeba34533c
am: 317d0cb169

Change-Id: I9fb47597393f5b1267ec37a05cd9aa34eebebd23
services/core/java/com/android/server/am/ActivityManagerService.java