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