Merge "Frameworks: Fix system server profiling" into pi-dev
am: a2d0f2f335 -s ours
Change-Id: I17c36c63528d2ff04875f6a69ce86f982ebb2400
This commit is contained in:
am: a2d0f2f335 -s ours
Change-Id: I17c36c63528d2ff04875f6a69ce86f982ebb2400