| commit | 35099dc4a5cabf3a7a0576ed18e11417e82d1165 | [log] [tgz] |
|---|---|---|
| author | Peter Wang <tpwang@google.com> | Fri Mar 25 10:11:56 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Mar 25 10:11:56 2022 +0000 |
| tree | 49d9d929a31c1032a2f781aa11076cca72ec3a00 | |
| parent | 21377c29a11c331b2fe5537fdfa8a7c5740a3046 [diff] | |
| parent | 5ee56fb6f8289b7282d2dc7661f90393c1d17143 [diff] |
[automerger skipped] Add a cancel string for ToggleSubscriptionDialog to handle Tamil am: 9ecda98ada -s ours am: 5ee56fb6f8 -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: Ie2574129cd6603bf90d7ffdd32e302b3c8abf79f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>