Merge "Framework: Clean up RuntimeInit/ZygoteInit/WrapperInit" am: 851afe56b8 am...

author Andreas Gampe <agampe@google.com>

Fri, 10 Feb 2017 01:03:15 +0000 (01:03 +0000)

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

Fri, 10 Feb 2017 01:03:15 +0000 (01:03 +0000)
author Andreas Gampe <agampe@google.com>
Fri, 10 Feb 2017 01:03:15 +0000 (01:03 +0000)
committer android-build-merger <android-build-merger@google.com>
Fri, 10 Feb 2017 01:03:15 +0000 (01:03 +0000)
diff --cc core/java/com/android/internal/os/ZygoteInit.java
Simple merge
diff --cc core/jni/AndroidRuntime.cpp
Simple merge
author	Andreas Gampe <agampe@google.com>
	Fri, 10 Feb 2017 01:03:15 +0000 (01:03 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Fri, 10 Feb 2017 01:03:15 +0000 (01:03 +0000)
		1	2
core/java/com/android/internal/os/ZygoteInit.java	patch \|	diff1 \|	diff2 \|	blob \| history
core/jni/AndroidRuntime.cpp	patch \|	diff1 \|	diff2 \|	blob \| history