[automerger skipped] Add back the flag to disable Settings large-screen optimization am: efa80f56b3
am: 4fb6115527
am: 5b110cef00
-s ours
am skip reason: Merged-In I9fdca6644ee7302f52fe3b850a357bae76dbacf3 with SHA-1 9e53e0ec95
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/23345500
Change-Id: Ieac912f397322f7e43568b7ab30ad836a18c73eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
d9d3fa7e33