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:
528a45e
809c132
)
am f7f46dda: am b324911b: Merge "If \'customTokens\', let authenticator handle notifi...
author
Costin Manolache
<costin@google.com>
Wed, 26 Jan 2011 00:22:34 +0000
(16:22 -0800)
committer
Android Git Automerger
<android-git-automerger@android.com>
Wed, 26 Jan 2011 00:22:34 +0000
(16:22 -0800)
* commit '
f7f46dda1e3391661138242be767ecefc15750d2
':
If 'customTokens', let authenticator handle notification.
Trivial merge