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:
49dae8a
09ed308
)
am 446547af: Merge "Don\'t throw when userActivity fails because of the permission...
author
Joe Onorato
<joeo@android.com>
Mon, 11 Oct 2010 20:55:15 +0000
(13:55 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Mon, 11 Oct 2010 20:55:15 +0000
(13:55 -0700)
Merge commit '
446547af37fd10142f15f6a9b3ac3007c6473981
' into gingerbread-plus-aosp
* commit '
446547af37fd10142f15f6a9b3ac3007c6473981
':
Don't throw when userActivity fails because of the permission check.
Trivial merge