| commit | ddbb0a3c33a070a6337cdb17b1063eee545df1e8 | [log] [tgz] |
|---|---|---|
| author | Michael Wright <michaelwr@google.com> | Wed Apr 02 20:45:00 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 02 20:45:00 2014 +0000 |
| tree | e0f017cc2f9b48c944c3f6f6211f31e10e30510e | |
| parent | 2766e37d85eb4ae91095dc6822cce421473f08cb [diff] | |
| parent | 744cf2b98f3f643380ab1db53e3d2216ecf9d872 [diff] |
am 744cf2b9: (-s ours) am 4932a355: Merge "Misc. buttons aren\'t gamepad keys." into klp-modular-dev * commit '744cf2b98f3f643380ab1db53e3d2216ecf9d872': Misc. buttons aren't gamepad keys.