| commit | 6a8ce030212357e35c4c9e7da96bfaacc3ea6021 | [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 | d64555fda757fbbbcca84caddc12852f2275f65e | |
| parent | 37c31dfe3bba7c7e01c9f0a3aa19acbdcc942fa7 [diff] | |
| parent | a30d340bee3d475544f0d63b1005ff66bd6af70c [diff] |
Merge "Don't initialize atrace if it's already disabled." am: 0e239bbd8b am: 2fc40a6518 Change-Id: Ie09245ba017121912541479ae6f138b0246d8666