| commit | c06283bb8bf775b8337b5bf13af901a8da6b650e | [log] [tgz] |
|---|---|---|
| author | Michael Wright <michaelwr@google.com> | Fri Mar 28 19:42:39 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 28 19:42:39 2014 +0000 |
| tree | a3be02eca369f3c5c53ea4b3e992443a2a0386e8 | |
| parent | 8b834ffd9b1c5df77413e99a3fdfacf6cd89ed52 [diff] | |
| parent | 6c4e2d816b244c46baac53cbe638ac87be703859 [diff] |
am 6c4e2d81: (-s ours) am 773585e6: Merge "Generate ACTION_CANCEL on joystick disconnect. DO NOT MERGE" into klp-modular-dev * commit '6c4e2d816b244c46baac53cbe638ac87be703859': Generate ACTION_CANCEL on joystick disconnect. DO NOT MERGE