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:
dc0c9a0
15eb7fe
)
Merge "Handle Bluetooth is not supported on emulator" into pi-dev am: 942b07da93
author
Ryan Lin
<ryanywlin@google.com>
Fri, 1 Jun 2018 05:41:53 +0000
(22:41 -0700)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 1 Jun 2018 05:41:53 +0000
(22:41 -0700)
am:
15eb7fe8c4
Change-Id: I515f9679afa7962fda4f2d04392007d201468070
1
2
src/com/android/settings/sound/AudioSwitchPreferenceController.java
patch
|
diff1
|
diff2
|
blob
|
history
tests/robotests/src/com/android/settings/sound/AudioOutputSwitchPreferenceControllerTest.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/com/android/settings/sound/AudioSwitchPreferenceController.java
Simple merge
diff --cc
tests/robotests/src/com/android/settings/sound/AudioOutputSwitchPreferenceControllerTest.java
Simple merge