tree 23b2aa18c0ae0edf232e8d863914feb230e8a2e8
parent f2551ffcd440b990cf49b1a3e2b0f6b8c70c6d45
parent a40916d534da1b3e05c905b5beb931e0140a353f
author Dan Sandler <dsandler@android.com> 1392410318 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410318 +0000

am a40916d5: Merge "Size hotseat data structure appropriately." into jb-ub-now-kermit

* commit 'a40916d534da1b3e05c905b5beb931e0140a353f':
  Size hotseat data structure appropriately.