OSDN Git Service
(root)
/
android-x86
/
packages-apps-Settings.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e81063a
88cbe51
)
Merge "Clean up: delete unused methods" am: 41f9566da8 am: b371dea0cb
author
Fan Zhang
<zhfan@google.com>
Thu, 13 Sep 2018 00:44:52 +0000
(17:44 -0700)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 13 Sep 2018 00:44:52 +0000
(17:44 -0700)
am:
88cbe51f27
Change-Id: Ib166230d692cc7a3973355239161ed88ffd6af60
1
2
src/com/android/settings/SettingsPreferenceFragment.java
patch
|
diff1
|
diff2
|
blob
|
history
src/com/android/settings/connecteddevice/usb/UsbDetailsFragment.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/com/android/settings/SettingsPreferenceFragment.java
Simple merge
diff --cc
src/com/android/settings/connecteddevice/usb/UsbDetailsFragment.java
index
4b717e0
,
0ef01d9
..
936a4c0
---
1
/
src/com/android/settings/connecteddevice/usb/UsbDetailsFragment.java
---
2
/
src/com/android/settings/connecteddevice/usb/UsbDetailsFragment.java
+++ b/
src/com/android/settings/connecteddevice/usb/UsbDetailsFragment.java
@@@
-17,9
-17,7
+17,8
@@@
package com.android.settings.connecteddevice.usb;
import android.content.Context;
- import android.os.Bundle;
import android.provider.SearchIndexableResource;
+
import androidx.annotation.VisibleForTesting;
import com.android.internal.logging.nano.MetricsProto;