Merge "Debug: Add attachJvmtiAgent with classloader" am: 940c0341f0 am: 878abd8e91

author Andreas Gampe <agampe@google.com>

Mon, 22 Jan 2018 20:14:49 +0000 (20:14 +0000)

committer android-build-merger <android-build-merger@google.com>

Mon, 22 Jan 2018 20:14:49 +0000 (20:14 +0000)
author Andreas Gampe <agampe@google.com>
Mon, 22 Jan 2018 20:14:49 +0000 (20:14 +0000)
committer android-build-merger <android-build-merger@google.com>
Mon, 22 Jan 2018 20:14:49 +0000 (20:14 +0000)
diff --cc api/current.txt
Simple merge
diff --cc core/java/android/os/Debug.java
Simple merge
author	Andreas Gampe <agampe@google.com>
	Mon, 22 Jan 2018 20:14:49 +0000 (20:14 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Mon, 22 Jan 2018 20:14:49 +0000 (20:14 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
core/java/android/os/Debug.java	patch \|	diff1 \|	diff2 \|	blob \| history