OSDN Git Service

resolve merge conflicts of 7849607a7ca9518f57fb22cca5665b88e99134c2 to pi-dev-plus...
authorLei Yu <jackqdyulei@google.com>
Thu, 25 Oct 2018 21:20:08 +0000 (14:20 -0700)
committerLei Yu <jackqdyulei@google.com>
Thu, 25 Oct 2018 21:25:21 +0000 (14:25 -0700)
commite81224d80c3af797003a40f06fc7563728a0da96
tree6bcd5d7c5f2172eee9ac4093931eb33bdc38b86c
parent816e75fbc3b3efe75babc66e06cda03cfd7d751b
parent7849607a7ca9518f57fb22cca5665b88e99134c2
resolve merge conflicts of 7849607a7ca9518f57fb22cca5665b88e99134c2 to pi-dev-plus-aosp

Bug: 115707279
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ifd8f2c090ccd9eadbc7b789b927550bce732f1d1
Merged-In: I3d2ebad2879479a870bcdfe596bb88b83c424389
src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsController.java
tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsControllerTest.java