tree 1cee5bde357fe0b2855b30f6641c65330ed1292e
parent 4d386b25859a0e1558f91111446f2280e760d598
parent da38d0d3978da1c141effc1562dfbb2d50893555
author Sunny Goyal <sunnygoyal@google.com> 1408992190 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1408992190 +0000

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

* commit 'da38d0d3978da1c141effc1562dfbb2d50893555':
  Changing hotseat keyboard controls