OSDN Git Service
(root)
/
android-x86
/
frameworks-native.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5d95f61
03ba157
)
am 686d9ff5: merge from open-source master
author
The Android Open Source Project
<initial-contribution@android.com>
Mon, 10 May 2010 19:53:28 +0000
(12:53 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Mon, 10 May 2010 19:53:28 +0000
(12:53 -0700)
Merge commit '
686d9ff53c32ded9b2b02eb9f2040f2030846e51
' into kraken
* commit '
686d9ff53c32ded9b2b02eb9f2040f2030846e51
':
Use isLocationProviderEnabled to test for enabled providers
Added WEB_URL_PATTERN for Montenegro ".me"
long modifier was on the wrong argument.
Trivial merge