| commit | 463b27bcabb16fd05cf64b432a87f2364bf79233 | [log] [tgz] |
|---|---|---|
| author | Jonathan Miranda <jonmiranda@google.com> | Thu Jun 24 21:42:19 2021 +0000 |
| committer | Jonathan Miranda <jonmiranda@google.com> | Thu Jun 24 21:43:03 2021 +0000 |
| tree | dc05464172ec82db51f82ab376bd6f858d7e8f26 | |
| parent | 118f3cfc0a0a6d19f5477a747ecac998ad664219 [diff] | |
| parent | ec551791ab153e49856e604a4069a9185d285a47 [diff] |
resolve merge conflicts of ec551791ab153e49856e604a4069a9185d285a47 to sc-v2-dev-plus-aosp
Move qsb according to spec.
Bug: 175329686
Test: visual test
checked 5x5 and confirmed no visual change
checked 4x5 and confirmed visual change
- tested various display sizes to ensure no overlapping is caused
Change-Id: Ia9ce25336fde3409836a2a9de544249b5afef717
Merged-In: I95a80b484516f634fa13347534810c7a51cecc8d