commit | c5a4576cab99dc52d077ff8190cd622b3d10adc3 | [log] [tgz] |
---|---|---|
author | Jerry Zhang <zhangjerry@google.com> | Fri May 12 19:50:20 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri May 12 19:50:20 2017 +0000 |
tree | e736587381d2e64f4789717fa557bd74728757b6 | |
parent | e9479a21b5a1e764b0292bbb4f72985e4fc807b2 [diff] | |
parent | f874fd319e7abfb8f8421827a0ce224b9881b661 [diff] |
Merge "Only force reset when adb is not enabled (i.e. mtp is)" into oc-dev am: f874fd319e Change-Id: I752aaae79bb2081add616d8183000ff63c6bf352