commit | 006cd45c86007194ab175a09dab6b5c379e75416 | [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 | 0d77d80aad0938db1d0907b2aab8708208207c51 [diff] | |
parent | 33d3758684c3fc6fa6c8666e8327c722323619fc [diff] |
Merge "Revert "Don't initialize atrace if it's already disabled."" am: c50d19c0b0 am: 33d3758684 Change-Id: I46f1627713be963686a5f5d36e5af24e2cd25626