commit | 855c629a421aac54c82eaca67a5baa41577c9ff2 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Mon May 17 07:03:24 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon May 17 07:03:24 2021 +0000 |
tree | 95912ea5236feb61fdfc0d8c3d29a565126b156b | |
parent | 63e5d424c12cbd4ebfff3b3bd563e614bead0acb [diff] | |
parent | 1c0267e8c4f82046b6121582f75fff32568ee170 [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: 1c0267e8c4 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1700268 Change-Id: Ibae959b15a5e2b738577d6f1f5e6d50cb7adbfcb