Merge "Correct Magnification shortcut title in edit shortcut dialog" into tm-dev am: 76ae78452d
am: 37927b4f20
am: dd237f0e63
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18332039 Change-Id: I5712c4fd2b8d9428250440e73f7e95941a04370d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: