tree 10da860fcff71886af91d082e31f0e1917926848
parent 83eaf660ba05e67f245d8e66ccf3e7a9c226f1a5
parent a0fa07a05fcb0ba4914a376abb717fabed3c80b8
author Dan Sandler <dsandler@android.com> 1414566424 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566424 +0000

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

* commit 'a0fa07a05fcb0ba4914a376abb717fabed3c80b8':