| commit | f80f60ba2b61df9f9544fcae8d8bdbe5542269fc | [log] [tgz] |
|---|---|---|
| author | Michael Wright <michaelwr@google.com> | Thu Mar 13 00:40:03 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 13 00:40:03 2014 +0000 |
| tree | d5046b0b305b80c112706fc3af488f0090637bc7 | |
| parent | 306c46884eb3121a981a0d1ed0c5461908c227fc [diff] | |
| parent | d23d916e0fc573ccde8a622aaa42ccfae9d31f82 [diff] |
am d23d916e: Merge "Controllers must have buttons and a movement mechanism." into klp-modular-dev * commit 'd23d916e0fc573ccde8a622aaa42ccfae9d31f82': Controllers must have buttons and a movement mechanism.