tree b9dea791c28ed384bf35a835ad3458418fd9bac3
parent 23855187f7522e75c07cbea80f465e755d207d11
parent 5aff893a2366b274e81c1c23e0c2fb266f080873
author Dan Sandler <dsandler@android.com> 1392411750 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411750 +0000

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

* commit '5aff893a2366b274e81c1c23e0c2fb266f080873':
  Size hotseat data structure appropriately.