tree 69953a95622f7ac6e09d8a05978387109fa15958
parent 1a3f73c5863996015927568e81a32fd8c17153f0
parent 0e239bbd8b205d4441aef5fa3643bef23ada3955
author Paul Crowley <paulcrowley@google.com> 1517348650 +0000
committer android-build-merger <android-build-merger@google.com> 1517348650 +0000

Merge "Don't initialize atrace if it's already disabled."
am: 0e239bbd8b

Change-Id: I3839188718fe70fb6e0bb94aacd2dc8de7612654