Merge "[i18n] Use Framelayout instead of Nest scroll" into udc-dev am: 8cd0c5816c
am: 5297f748e6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22530783 Change-Id: I64f08a5756883797ac204524fcd08e84aff2497e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: