| commit | ef87f637cb732ad83a14404559fdef7118e95d46 | [log] [tgz] |
|---|---|---|
| author | Paul Crowley <paulcrowley@google.com> | Tue Jan 30 22:14:34 2018 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jan 30 22:14:34 2018 +0000 |
| tree | e87506dc74203dea6fa10770ba5e30623e043c99 | |
| parent | b9c5fd417110b809b3f39bfcd7e5c62bcd349163 [diff] | |
| parent | 6a8ce030212357e35c4c9e7da96bfaacc3ea6021 [diff] |
Merge "Don't initialize atrace if it's already disabled." am: 0e239bbd8b am: 2fc40a6518 am: 65c685e204 Change-Id: I1ab9cff70cd461069f2db651ab96f449aae4666e