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:
f8d13e5
5f7203e
)
am 5f7203eb: am 5a27a754: am bd1dee94: Merge "gps: Adding ip address for AGps"
author
Mike Lockwood
<lockwood%android.com@gtempaccount.com>
Thu, 28 Jul 2011 21:04:13 +0000
(14:04 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Thu, 28 Jul 2011 21:04:13 +0000
(14:04 -0700)
* commit '
5f7203eb258503bc5d2ba29176bdf483a68a93b8
':
gps: Adding ip address for AGps
1
2
services/java/com/android/server/location/GpsLocationProvider.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/java/com/android/server/location/GpsLocationProvider.java
Simple merge