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:
cbdb213
c357518
)
Merge "Add fused location provider to real provider list" into jb-mr1-dev
author
Kenny Root
<kroot@google.com>
Tue, 9 Oct 2012 22:21:25 +0000
(15:21 -0700)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Tue, 9 Oct 2012 22:21:36 +0000
(15:21 -0700)
1
2
services/java/com/android/server/LocationManagerService.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/java/com/android/server/LocationManagerService.java
Simple merge