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:
1afb1cd
bfcfb7e
)
am bfcfb7ee: Merge change 22302 into eclair
author
Jaikumar Ganesh
<jaikumar@google.com>
Fri, 21 Aug 2009 18:56:06 +0000
(11:56 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Fri, 21 Aug 2009 18:56:06 +0000
(11:56 -0700)
Merge commit '
bfcfb7eec61bd196cfd91f7b2c5715751308c048
' into eclair-plus-aosp
* commit '
bfcfb7eec61bd196cfd91f7b2c5715751308c048
':
Set BondState to Canceled when user cancels pairing.
Trivial merge