OSDN Git Service

Merge "Enable profiling for system server for userdebug|eng" into oc-dev
authorMathieu Chartier <mathieuc@google.com>
Sat, 8 Apr 2017 01:34:31 +0000 (01:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 8 Apr 2017 01:34:31 +0000 (01:34 +0000)
am: 4567c1a1a3

Change-Id: Iefc5c2a9ca115d2df1c7c8a1e41a02be2afcfd90


Trivial merge