| commit | b7474a2d5a055810e4f13c2be1199c9792fa9ecd | [log] [tgz] |
|---|---|---|
| author | Paul Crowley <paulcrowley@google.com> | Thu Feb 08 17:35:14 2018 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Feb 08 17:35:14 2018 +0000 |
| tree | 17210d6fd4acf236109ef84994159443dddf180c | |
| parent | 22e9481ce7756a99a21982c9294d300da166b0ef [diff] | |
| parent | 049c6d001908903e05e1308567e897225fb58c8f [diff] |
Merge "Revert "Don't initialize atrace if it's already disabled."" am: c50d19c0b0 Change-Id: I55076549651d386ed7bdfab8ec05061049735271