tree 583b6f0ff71dfddd53d39d10e8ffa4c4376ffebd
parent 26ed7e6dfacf51ca4cfc727d5373b11a127d3b57
parent a508d399e720b3a535832ce0b2554680197944af
author Nick Kralevich <nnk@google.com> 1437714688 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1437714688 +0000

am a508d399: am 01e00c8c: am e4f10de7: am dd856a3f: am 3b0bbd7b: Merge "UsbDeviceManager: fix b/21429947 regression" into mnc-dev

* commit 'a508d399e720b3a535832ce0b2554680197944af':
  UsbDeviceManager: fix b/21429947 regression