tree 38edc61571474704eadf53463050f5b1d63cd4b0
parent 7c6213dd8d68d8868f73a18198573d37d3ee47d0
parent 27c270b3183af4ee9f6c3fbeac53c54e237eb49d
author Hector Dearman <hjd@google.com> 1556195467 -0700
committer android-build-merger <android-build-merger@google.com> 1556195467 -0700

Merge "Don't disable vendor tracing when --only_userspace" am: 957a41937b am: 314c95e822
am: 27c270b318

Change-Id: I58e224511b5038c987a1667b372b53039b94696d