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:
8818423
07e2d89
)
Merge "Fix RemoteListenerHelper vs. HAL deadlock" into oc-dr1-dev am: ec996b381d
author
Wyatt Riley
<wyattriley@google.com>
Sat, 22 Jul 2017 00:25:11 +0000
(
00:25
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Sat, 22 Jul 2017 00:25:11 +0000
(
00:25
+0000)
am:
07e2d89b35
Change-Id: If6be09131faf3b9956d6f20971be3b74d0f82f6e
1
2
services/core/java/com/android/server/LocationManagerService.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/core/java/com/android/server/LocationManagerService.java
Simple merge