OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
be7a9b8
ae21066
)
Sync the startConsentUiIfNeeded logics to master. We are missing the package name...
author
Shijian Li
<shijianli@google.com>
Thu, 12 Jan 2017 03:12:17 +0000
(
03:12
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 12 Jan 2017 03:12:17 +0000
(
03:12
+0000)
am:
ae21066a59
Change-Id: I3033d6d64d35f2c9c1aafe003eef0860c1f78efc
1
2
services/core/java/com/android/server/BluetoothManagerService.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/core/java/com/android/server/BluetoothManagerService.java
Simple merge