tree cba62d0d64153aa2169651696bc238591341d679
parent a0a4870ec0fe6fa6df70fe85472f586a07584537
parent 5aff893a2366b274e81c1c23e0c2fb266f080873
author Dan Sandler <dsandler@android.com> 1414085537 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085537 +0000

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

* commit '5aff893a2366b274e81c1c23e0c2fb266f080873':