OSDN Git Service

am 18587c55: am b5c44f90: am 709d013f: am 67e02e60: Merge "Fix issue #22487155: Devic...
authorDianne Hackborn <hackbod@google.com>
Thu, 16 Jul 2015 00:24:35 +0000 (00:24 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 16 Jul 2015 00:24:35 +0000 (00:24 +0000)
commitcd917ecf0abb011916e9d90f526a2eff454bc1e7
tree02f7c25ad574b204befb2138c8b1d1507b08957c
parent213a883a3ca5671ce43f7077e7618a1d2adc7e0c
parent18587c5511ce3304070d5ac77c112fccdde68e3b
am 18587c55: am b5c44f90: am 709d013f: am 67e02e60: Merge "Fix issue #22487155: Device unresponsive (deadlock in system_server)" into mnc-dev

* commit '18587c5511ce3304070d5ac77c112fccdde68e3b':
  Fix issue #22487155: Device unresponsive (deadlock in system_server)
services/core/java/com/android/server/am/ActivityManagerService.java