tree a9f3e457546b6cecaa3e44a76b1026a7e440b59c
parent 1baa17657ce793ef9bea39b171a9a5c2c5aa8c4c
parent dec12adb6dba114ad2feedce3a9f3ce0c178fc04
author Sunny Goyal <sunnygoyal@google.com> 1408991815 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1408991815 +0000

am dec12adb: Merge "Changing hotseat keyboard controls" into ub-now-porkchop

* commit 'dec12adb6dba114ad2feedce3a9f3ce0c178fc04':
  Changing hotseat keyboard controls