tree ff91223d9e15e1b4020bb5ae3001eea4e3f19e27
parent e7f9f3ee7c5f20213cc6ef04dd6ea60bc1c3bd45
parent 6d9e8666694eeffda9b1cc3d0945c18249ebe824
author Jonathan Miranda <jonmiranda@google.com> 1627081837 +0000
committer Jonathan Miranda <jonmiranda@google.com> 1627082024 +0000

resolve merge conflicts of 6d9e8666694eeffda9b1cc3d0945c18249ebe824 to sc-v2-dev

Add more extra space to hotseat for taller devices.

Bug: 194533368
Bug: 192520231
Change-Id: Ib4705342329767a3e4eb2781aff6cd72220e4eaa
Test: manual test on taller devices