Enable logwrapper functionality on user builds am: 0ca16fa584 am: db05d4b4ed am:...

author Tamas Berghammer <tberghammer@google.com>

Fri, 16 Dec 2016 20:03:36 +0000 (20:03 +0000)

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

Fri, 16 Dec 2016 20:03:36 +0000 (20:03 +0000)
author Tamas Berghammer <tberghammer@google.com>
Fri, 16 Dec 2016 20:03:36 +0000 (20:03 +0000)
committer android-build-merger <android-build-merger@google.com>
Fri, 16 Dec 2016 20:03:36 +0000 (20:03 +0000)
diff --cc core/java/com/android/internal/os/ZygoteConnection.java
Simple merge
diff --cc services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge
author	Tamas Berghammer <tberghammer@google.com>
	Fri, 16 Dec 2016 20:03:36 +0000 (20:03 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Fri, 16 Dec 2016 20:03:36 +0000 (20:03 +0000)
		1	2
core/java/com/android/internal/os/ZygoteConnection.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/am/ActivityManagerService.java	patch \|	diff1 \|	diff2 \|	blob \| history