| commit | eb3e2a274471c654f9aea30e3da1047818000388 | [log] [tgz] |
|---|---|---|
| author | Paul Lawrence <paullawrence@google.com> | Sat Jun 06 17:04:27 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jun 06 17:04:27 2015 +0000 |
| tree | fd38730b5a4599dd1c219effec9b509e4c57f190 | |
| parent | 9b7ec29f0d4c04bbd24a33f9677668f1c3a297c9 [diff] | |
| parent | 18a2c167f773c3d4587a0bcb0c180ddda188ef39 [diff] |
am 0ec4b936: am 439cdfd0: am af0baad7: Merge "adb shouldn\'t trace unless told to" * commit '0ec4b9363a0298b2da532d3591f4ae99b04d88db': adb shouldn't trace unless told to