Merge "Enable profiling for system server for userdebug|eng" into oc-dev

author Mathieu Chartier <mathieuc@google.com>

Sat, 8 Apr 2017 01:26:53 +0000 (01:26 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Sat, 8 Apr 2017 01:26:57 +0000 (01:26 +0000)
author Mathieu Chartier <mathieuc@google.com>
Sat, 8 Apr 2017 01:26:53 +0000 (01:26 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Sat, 8 Apr 2017 01:26:57 +0000 (01:26 +0000)
diff --cc core/java/com/android/internal/os/ZygoteInit.java
Simple merge
author	Mathieu Chartier <mathieuc@google.com>
	Sat, 8 Apr 2017 01:26:53 +0000 (01:26 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Sat, 8 Apr 2017 01:26:57 +0000 (01:26 +0000)