tree 30ea16f27ffdb97b92fbbd3289c8330bc4aaa02f
parent 2da3cde881bff54d0ed9b2fad2e5f834a12db913
parent ad838888c52c210644ca1fa4a20efdf6b727ccd7
author Daniel Colascione <dancol@google.com> 1522288256 +0000
committer android-build-merger <android-build-merger@google.com> 1522288256 +0000

Merge "Remove ATRACE_TAG_APP from atrace's control" am: fdc2d23054
am: ad838888c5

Change-Id: Ied32642e0e104ef363f550627480137f24e8a195