tree f9af1f60084cc3983d68b702b313b6715db112ae
parent 9e11bb0cdb7c288b0f53fa5081a3dadf4376c329
parent b652ac4bd85023455ff01ba413543f2037b45dbb
author Josh Gao <jmgao@google.com> 1517983973 +0000
committer android-build-merger <android-build-merger@google.com> 1517983973 +0000

Merge "adb: don't spew to logcat when tracing is enabled." am: 28c44863f6
am: b652ac4bd8

Change-Id: I47e464c9d9e50e67cde76340f9109f28cc3845a2