commit | 8645dd1204d6fba0e942a0ad745186d4b47a8f2e | [log] [tgz] |
---|---|---|
author | Paul Crowley <paulcrowley@google.com> | Tue Jan 30 22:14:34 2018 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Jan 30 22:14:34 2018 +0000 |
tree | 78473f8d3639ccfaf0fc6ddf73c2311317850550 | |
parent | 9e2465f52f6c0ffc92a67b32324e11a82eb1f870 [diff] | |
parent | 65c685e20400e13c683e55ec58739550a4efdc77 [diff] |
Merge "Don't initialize atrace if it's already disabled." am: 0e239bbd8b am: 2fc40a6518 am: 65c685e204 Change-Id: I1ab9cff70cd461069f2db651ab96f449aae4666e