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