Merge "Create separate On/Off string resources for Vibration & haptics" into tm-dev am: 9c8d1e94fb am: 9066672c7d am: 4e60155f11
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17914337 Change-Id: I85fca83fcf7e03b306277508da6d6b4880474f75 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: