Merge "Correct Magnification shortcut title" into tm-dev am: 12c10cfa5c
am: 2fc065c351
am: 448ecc09ad
am: eb012aee8f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910930 Change-Id: I8df9bcc9f9dd88dde56f3b772d0fb2ba6706a756 Ignore-AOSP-First: this is an automerge Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: