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