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:
85b87cf
315583c
)
am 5ebaf106: merge from open-source master
author
The Android Open Source Project
<initial-contribution@android.com>
Thu, 22 Apr 2010 20:25:14 +0000
(13:25 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Thu, 22 Apr 2010 20:25:14 +0000
(13:25 -0700)
Merge commit '
5ebaf10693725c9dc48219c3c65945b84d74692f
' into kraken
* commit '
5ebaf10693725c9dc48219c3c65945b84d74692f
':
Fix broken logic in SettingsProvider.parseProviderList.
Trivial merge