| commit | f874fd319e7abfb8f8421827a0ce224b9881b661 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri May 12 19:41:47 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri May 12 19:41:52 2017 +0000 |
| tree | e80f8cdaa24fe6a125a3a81ed95b5b7c36dfe3b8 | |
| parent | a44c50f3626685f6663a9fe3beb62a54baf94baa [diff] | |
| parent | ad962a923c0b8ec555d3474b394bc3bed0f3613d [diff] |
Merge "Only force reset when adb is not enabled (i.e. mtp is)" into oc-dev