OSDN Git Service

am f80f60ba: am d23d916e: Merge "Controllers must have buttons and a movement mechani...
authorMichael Wright <michaelwr@google.com>
Thu, 13 Mar 2014 00:42:43 +0000 (00:42 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 13 Mar 2014 00:42:43 +0000 (00:42 +0000)
* commit 'f80f60ba2b61df9f9544fcae8d8bdbe5542269fc':
  Controllers must have buttons and a movement mechanism.


Trivial merge