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:
1b75120
773585e
)
am 773585e6: Merge "Generate ACTION_CANCEL on joystick disconnect. DO NOT MERGE"...
author
Michael Wright
<michaelwr@google.com>
Fri, 28 Mar 2014 19:37:39 +0000
(19:37 +0000)
committer
Android Git Automerger
<android-git-automerger@android.com>
Fri, 28 Mar 2014 19:37:39 +0000
(19:37 +0000)
* commit '
773585e60c2e6c3e39f9f56d0d3b05eeae6dff04
':
Generate ACTION_CANCEL on joystick disconnect. DO NOT MERGE
Trivial merge