Merge "Improve container capability bounding in containers"

author Treehugger Robot <treehugger-gerrit@google.com>

Wed, 16 Aug 2017 21:16:50 +0000 (21:16 +0000)

committer Gerrit Code Review <noreply-gerritcodereview@google.com>

Wed, 16 Aug 2017 21:16:50 +0000 (21:16 +0000)
author Treehugger Robot <treehugger-gerrit@google.com>
Wed, 16 Aug 2017 21:16:50 +0000 (21:16 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Wed, 16 Aug 2017 21:16:50 +0000 (21:16 +0000)
diff --cc core/java/com/android/internal/os/ZygoteInit.java
Simple merge
diff --cc core/jni/com_android_internal_os_Zygote.cpp
Simple merge
author	Treehugger Robot <treehugger-gerrit@google.com>
	Wed, 16 Aug 2017 21:16:50 +0000 (21:16 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Wed, 16 Aug 2017 21:16:50 +0000 (21:16 +0000)
		1	2
core/java/com/android/internal/os/ZygoteInit.java	patch \|	diff1 \|	diff2 \|	blob \| history
core/jni/com_android_internal_os_Zygote.cpp	patch \|	diff1 \|	diff2 \|	blob \| history