OSDN Git Service

Merge "Add new debug feature to track associations between processes. Also add some...
authorDianne Hackborn <hackbod@google.com>
Thu, 8 Jan 2015 18:17:33 +0000 (18:17 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 8 Jan 2015 18:17:33 +0000 (18:17 +0000)
automerge: 30ae442

* commit '30ae442133c55d4aa3636127de556736b2eaa99f':
  Add new debug feature to track associations between processes.  Also add some debugging for spurious service ANRs.

1  2 
services/core/java/com/android/server/am/ActivityManagerService.java