Merge changes from topic "manual-zygote-snap" am: 391bc944 am: c39334a8

Change-Id: Ie806e8d213b6a959bb76b7b29ff8a514d3c3c788

core/java/com/android/internal/os/ZygoteServer.java

+1 −2

Original line number	Diff line number	Diff line
		@@ -184,9 +184,8 @@ class ZygoteServer {
		Zygote.USAP_POOL_SECONDARY_SOCKET_NAME);
		}

		fetchUsapPoolPolicyProps();

		mUsapPoolSupported = true;
		fetchUsapPoolPolicyProps();
		}

		void setForkChild() {