OSDN Git Service

Merge "Adding "attach-agent" to ActivityManagerShellCommand" am: 05dfd10254
authorLeonard Mosescu <mosescu@google.com>
Thu, 16 Feb 2017 23:29:16 +0000 (23:29 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 16 Feb 2017 23:29:16 +0000 (23:29 +0000)
commit7bf598cbd9f7f57742f813ca0b576ffd732d5b3a
tree79bbb6e3ae91bd4f4910f9e5819e4e34b0670910
parenta494d7287f6dd3ce600a1e2bb8346b0dc7bf7cfc
parentdb0803b4e815f3e4e180c0502912dbbca42e1710
Merge "Adding "attach-agent" to ActivityManagerShellCommand" am: 05dfd10254
am: db0803b4e8

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