commit | a87aa178f96924381605a1e17b852e5dfed520a0 | [log] [tgz] |
---|---|---|
author | Paul Crowley <paulcrowley@google.com> | Thu Feb 08 17:39:24 2018 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Feb 08 17:39:24 2018 +0000 |
tree | 336832a5e8bc6d145bbc891d488532a47d28c111 | |
parent | e6e1a7a7aab92fe1fa938e251255a2d6589716ca [diff] | |
parent | b7474a2d5a055810e4f13c2be1199c9792fa9ecd [diff] |
Merge "Revert "Don't initialize atrace if it's already disabled."" am: c50d19c0b0 am: 33d3758684 Change-Id: I46f1627713be963686a5f5d36e5af24e2cd25626