commit | 7e0fad1d442428b9a2ba5d88ce7f8a59869acb0e | [log] [tgz] |
---|---|---|
author | Satoshi Kataoka <satok@google.com> | Tue Jul 09 10:25:02 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 09 10:25:02 2013 -0700 |
tree | c54e8af22ec80e315b6eb555c1070bba4ceefa5e | |
parent | fc13329b8430a62c02f7109e1b7cf0abcaa896ee [diff] | |
parent | 8b95d259b9f66342ba5ae6e8f4ea262dcb1de05b [diff] |
am 8b95d259: am b7925f22: Merge "Revert "Stop marking gamepads as keyboards"" into jb-mr2-dev * commit '8b95d259b9f66342ba5ae6e8f4ea262dcb1de05b': Revert "Stop marking gamepads as keyboards"