tree 7d1e9feba83c1732dd21503b28fff610d2c68c2d
parent dae6ac286dc5fce578746f2abba8f065fb7ecd48
parent 880c601013e3b58f004f65c6cacfb8e19e2ca863
author Tim Kilbourn <tkilbourn@google.com> 1442686487 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442686487 +0000

am 880c6010: am 0c4050b0: am bdfbd821: am 0eb10ede: Merge "Always set the usb config when modifying it." into mnc-dr-dev

* commit '880c601013e3b58f004f65c6cacfb8e19e2ca863':
  Always set the usb config when modifying it.