| commit | 0ec4b9363a0298b2da532d3591f4ae99b04d88db | [log] [tgz] |
|---|---|---|
| author | Paul Lawrence <paullawrence@google.com> | Sat Jun 06 00:35:18 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jun 06 00:35:18 2015 +0000 |
| tree | 48540cd8eeecc93d73ec0b54545d4cdf2f4b538a | |
| parent | 7c7b0c83d63aa31178ad74be62a2e784df490c99 [diff] | |
| parent | 439cdfd0bfa8ee2cf0996f517e61ab9f7d90bdc6 [diff] |
am 439cdfd0: am af0baad7: Merge "adb shouldn\'t trace unless told to" * commit '439cdfd0bfa8ee2cf0996f517e61ab9f7d90bdc6': adb shouldn't trace unless told to