| commit | 1c0267e8c4f82046b6121582f75fff32568ee170 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Sat May 08 03:34:30 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat May 08 03:34:30 2021 +0000 |
| tree | f4ba0a6f3075738095e388a236953d76608db01f | |
| parent | bb837f1ec07410319e423080d66f318e7b0982e2 [diff] | |
| parent | 93c8398216c2f3afa00213d2ea3d026c141271aa [diff] |
[automerger skipped] Merge "DO NOT MERGE - Mark RQ2A.210105.001 as merged." am: 6811428c9c -s ours am: 1b68f3bfd3 -s ours am: a7d220aad7 -s ours am: e49a0d1b4e -s ours am: 93c8398216 -s ours am skip reason: Merged-In Ic91dd36f6de39ef79f1ced90083e1c5c7836c651 with SHA-1 6f3630c393 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1700268 Change-Id: I194a49ce5bccf4cd3659af604938eb6da6ed4f67