OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: e81224d) | patch
Revert "resolve merge conflicts of 7849607a7ca9518f57fb22cca5665b88e99134c2 to pi...
authorLei Yu <jackqdyulei@google.com>
Mon, 29 Oct 2018 20:33:19 +0000 (20:33 +0000)
committerLei Yu <jackqdyulei@google.com>
Mon, 29 Oct 2018 20:35:24 +0000 (20:35 +0000)
commit73c361b544d49aaf1424d8d30290ccaebb273be8
treecc14783627c67f9e51ee4f167c7eed0a2ec7517ftree | snapshot
parente81224d80c3af797003a40f06fc7563728a0da96commit | diff
Revert "resolve merge conflicts of 7849607a7ca9518f57fb22cca5665b88e99134c2 to pi-dev-plus-aosp"

This reverts commit e81224d80c3af797003a40f06fc7563728a0da96.

Reason for revert: broke pi-dev-plus-aosp

Change-Id: Ib45b96216017d01b6301a558a0cd27bf1071779c
Merged-In: I3d2ebad2879479a870bcdfe596bb88b83c424389
src/com/android/settings/connecteddevice/usb/UsbDefaultFragment.java diff | blob | history
src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsController.java diff | blob | history
tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDefaultFragmentTest.java diff | blob | history
tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsControllerTest.java diff | blob | history
packages/apps/Settings
About OSDN
Find Software
Develop Software
Help