tree 8929eae27f8be3c28d8c21b129fa5be407c91df6
parent f47a26531a2e004c9c61273754c7718d91d6d30a
parent 8fce1536ffc42d3da77aa01c0bbbaeb0f402d155
author Carmen Jackson <carmenjackson@google.com> 1527183618 -0700
committer android-build-merger <android-build-merger@google.com> 1527183618 -0700

Merge "Atrace: Add the debug.atrace.user_initiated property." am: d9671a4aa0
am: 8fce1536ff

Change-Id: Ib6b67635d328d03bb326bf309a3abe5bcc83f440