[automerger skipped] Merge "Revert "Add a cancel string for ToggleSubscriptionDialog to handle Tamil"" am: 02db0438a9 -s ours

Browse Source

am skip reason: Merged-In Id7f6042e0f7c70a3a8ca951fb80bb7f30acedcb9 with SHA-1 494c68e3cf is already in history. Merged-In was found from reverted change.

Reverted change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043030

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043032

Change-Id: I04b09953f289daa0f1c523577baecfa186753329
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

...

This commit is contained in:

SongFerng Wang

2022-03-25 17:04:53 +00:00

committed by Automerger Merge Worker

parent 9c1f66d741 02db0438a9

commit 5dea8d562f

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available