OSDN Git Service

Merge "[Debug]: Add timeout for dumpNativeBacktraceToFile." am: b6f7a85b85
authorsongjinshi <songjinshi@xiaomi.com>
Wed, 8 Feb 2017 20:22:26 +0000 (20:22 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 8 Feb 2017 20:22:26 +0000 (20:22 +0000)
commit36bcc913f7f5b2150e8b467eb4a52e0dc4663e5b
tree38c3163bdd7ec4961813373c688c6592eb8f4352
parent76002353391a69a8432d38d0bda14eacc2e0ea09
parentec69bd0aa3eeaab9082cd22103c919aabe750aa2
Merge "[Debug]: Add timeout for dumpNativeBacktraceToFile." am: b6f7a85b85
am: ec69bd0aa3

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