| commit | c9947a77735273c81dee0898f251ba542cd22c5d | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Fri Apr 08 21:04:02 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Apr 08 21:04:02 2022 +0000 |
| tree | db2a1456d199bcfbf0408d3c958ba190f3bbe528 | |
| parent | c4446388246c6710f50d6eaf72376990fcec70db [diff] | |
| parent | 16b15e9e4fe4cda7b585b5a74e24e800a59bab39 [diff] |
[automerger skipped] Merge SP2A.220405.004 to aosp-master - DO NOT MERGE am: 35525a5617 -s ours am: ee5c8c915e -s ours am: fdcf2eed39 -s ours am: 4dd803da1d -s ours am: 3e95b42bec -s ours am: 16b15e9e4f -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2059150 Change-Id: Ib52b898785576e74ea44117d1e4736a788927bf9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>