| commit | a30d340bee3d475544f0d63b1005ff66bd6af70c | [log] [tgz] |
|---|---|---|
| author | Paul Crowley <paulcrowley@google.com> | Tue Jan 30 21:44:10 2018 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jan 30 21:44:10 2018 +0000 |
| tree | 109e47b13169f9d05a06daeff691a7a846736399 | |
| parent | e89de4115aab8f97aca11e07852d21643420050b [diff] | |
| parent | 0987c2f9a77a303e10ab1f0477c790eff7a333f4 [diff] |
Merge "Don't initialize atrace if it's already disabled." am: 0e239bbd8b Change-Id: I3839188718fe70fb6e0bb94aacd2dc8de7612654