| commit | 653fbeeec4b8f42787d480c2b0a0e9c5f479202a | [log] [tgz] |
|---|---|---|
| author | Jerry Zhang <zhangjerry@google.com> | Fri May 12 20:31:51 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri May 12 20:31:51 2017 +0000 |
| tree | 8334f8dc8710dd20f1651cb5b059de52d3f37f47 | |
| parent | e088e568f263c5a44b08b435675f8591223e6ad6 [diff] | |
| parent | c5a4576cab99dc52d077ff8190cd622b3d10adc3 [diff] |
Merge "Only force reset when adb is not enabled (i.e. mtp is)" into oc-dev am: f874fd319e am: c5a4576cab Change-Id: I153a5ad3e4bd0de9a62ef39ebc7579f4916b79e3