commit | 833bb9054e9e3a9ebf31bcad378bdb44be1a97a2 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Fri Apr 08 21:04:26 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Apr 08 21:04:26 2022 +0000 |
tree | db2a1456d199bcfbf0408d3c958ba190f3bbe528 | |
parent | c9947a77735273c81dee0898f251ba542cd22c5d [diff] | |
parent | c94c92f0b344032606fe493044a16cedac5f6a1f [diff] |
[automerger skipped] Merge "Merge SP2A.220405.004 to aosp-master - DO NOT MERGE" am: c854c108a2 -s ours am: 6df1ae4e5f -s ours am: 74fc91b313 -s ours am: ee03d0172d -s ours am: e82d15ef8a -s ours am: c94c92f0b3 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2059150 Change-Id: I0edd840c70cd5558f0f8bdb3980dd6c3380fabf1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>