| commit | 393e031cf892ff08e88be5d811b79687a008514e | [log] [tgz] |
|---|---|---|
| author | Kevin Liu <congxiliu@google.com> | Wed Jan 11 19:32:57 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jan 11 19:32:57 2023 +0000 |
| tree | 3e566dbf2f1a29e5456526203afc903478c2628b | |
| parent | 7bde01aba9b3ad0040332a80a3c8b4bffcc85714 [diff] | |
| parent | c41c1fb83cc9f4dd8534dc07ed42752cab808bc8 [diff] |
Revert "[automerger skipped] resolve merge conflicts of 521278a0..." am: c41c1fb83c -s ours am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 e81d98cc08 is already in history. Merged-In was found from reverted change. Reverted change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20918022 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20944170 Change-Id: I99b6cfa13657354e2bebd91f80948654ab7f4d01 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>