[automerger skipped] Merge "Add a cancel string for the dialog to handle Tamil translation" am: 7ba3e20afb
-s ours am: 8030d66e0d
-s ours am: b88a4a8830
-s ours am: a32f1f6efa
-s ours am: 2ad2d6fed0
-s ours
am skip reason: Merged-In I90149c9e4459747d8cd1c35d00c29f81710eb6f4 with SHA-1 9ecda98ada
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043033
Change-Id: I01859cefc7a744e890780fc8eed095c52810e08f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: