am 9e7a0ddb: am 18089ceb: Allow debugging only for apps forked from zygote DO NOT...

author Sebastien Hertz <shertz@google.com>

Fri, 21 Aug 2015 10:09:22 +0000 (10:09 +0000)

committer Android Git Automerger <android-git-automerger@android.com>

Fri, 21 Aug 2015 10:09:22 +0000 (10:09 +0000)
author Sebastien Hertz <shertz@google.com>
Fri, 21 Aug 2015 10:09:22 +0000 (10:09 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Fri, 21 Aug 2015 10:09:22 +0000 (10:09 +0000)
diff --cc cmds/app_process/app_main.cpp
Simple merge
diff --cc core/jni/AndroidRuntime.cpp
Simple merge
author	Sebastien Hertz <shertz@google.com>
	Fri, 21 Aug 2015 10:09:22 +0000 (10:09 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Fri, 21 Aug 2015 10:09:22 +0000 (10:09 +0000)
		1	2
cmds/app_process/app_main.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
core/jni/AndroidRuntime.cpp	patch \|	diff1 \|	diff2 \|	blob \| history