tree c028bfe537607823c37e2ffc8c713c73059d3130
parent 8aafcf3ddedd650554faa7664783f0e5dac458a1
parent b452f3209d5fafafb825d85408fa59590ad94918
author Sunny Goyal <sunnygoyal@google.com> 1422685311 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422685311 +0000

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

* commit 'b452f3209d5fafafb825d85408fa59590ad94918':