| commit | 65c685e20400e13c683e55ec58739550a4efdc77 | [log] [tgz] |
|---|---|---|
| author | Paul Crowley <paulcrowley@google.com> | Tue Jan 30 22:00:01 2018 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jan 30 22:00:01 2018 +0000 |
| tree | 487b39f653679013dd14cfd79bfe57a8a0302e67 | |
| parent | 2bce860b2e21764e4fdb3b71c5f244e45a1bddf4 [diff] | |
| parent | 2fc40a651875a1211d936e934276afe0c6949cea [diff] |
Merge "Don't initialize atrace if it's already disabled." am: 0e239bbd8b am: 2fc40a6518 Change-Id: Ie09245ba017121912541479ae6f138b0246d8666