commit | c538b49d64fc60cc5f15a16a9ad539dcb06fed98 | [log] [tgz] |
---|---|---|
author | Peter Wang <tpwang@google.com> | Fri Mar 25 11:00:03 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Mar 25 11:00:03 2022 +0000 |
tree | 061f64f9b1c9e4332205b8c1682c33d38b9446b2 | |
parent | 7b2a8e786f5e96373f400a5c29410cef2ebbcafa [diff] | |
parent | 25a88e5a57a3e966ed4cebbfeeae681ade22cade [diff] |
[automerger skipped] Add a cancel string for ToggleSubscriptionDialog to handle Tamil am: 9ecda98ada -s ours am: 5ee56fb6f8 -s ours am: 35099dc4a5 -s ours am: 84351f8360 -s ours am: 25a88e5a57 -s ours am skip reason: Merged-In I90149c9e4459747d8cd1c35d00c29f81710eb6f4 with SHA-1 eba8857094 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2043030 Change-Id: Ie75076efbfed9c50d2826f5cc6b23679b747e987 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>