tree 10da860fcff71886af91d082e31f0e1917926848
parent c091da6eda03cf4b3fea6fa1e475fc209c8b9dc1
parent da38d0d3978da1c141effc1562dfbb2d50893555
author Sunny Goyal <sunnygoyal@google.com> 1422666479 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422666479 +0000

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

* commit 'da38d0d3978da1c141effc1562dfbb2d50893555':