tree b9dea791c28ed384bf35a835ad3458418fd9bac3
parent 6effa1e3575d196a66446885d3364589ba93090d
parent 5ab7187d6eccd41680314d0a830f5cafe6fe4a3f
author Dan Sandler <dsandler@android.com> 1392411272 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411272 +0000

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

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