tree da9b993f9e266e8ac660f3b83c5207218480c692
parent 515d581d2d99e484c5989f1ee06f42ba1cb6942d
parent 6f009d9496fc060ba76f97348aa0702a62fcf927
author Paul Lawrence <paullawrence@google.com> 1433549336 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1433549337 +0000

Merge "adb shouldn't trace unless told to"