tree 309d565b88a15ae8748540b2390f8a4050d22744
parent c116dca49382c14452d7b0ef3dca7a99fd4b92f5
parent 2e8356ba6451008b1a6317072a8b7a28960af158
author Jonathan Miranda <jonmiranda@google.com> 1627081957 +0000
committer Jonathan Miranda <jonmiranda@google.com> 1627082052 +0000

resolve merge conflicts of 2e8356ba6451008b1a6317072a8b7a28960af158 to sc-v2-dev-plus-aosp

Add more extra space to hotseat for taller devices.

Bug: 194533332
Bug: 192520231
Change-Id: Ia0fa307bb4085e6fbc5d873b6dec63ab7fb53fea
Test: manual test on taller devices