commit | 6df1ae4e5f8d098a7dcd85612b6de005138017f4 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Fri Apr 08 18:31:36 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Apr 08 18:31:36 2022 +0000 |
tree | 1a76b4a0128bba6ef9fc216c0ec06ad872a42f31 | |
parent | ee5c8c915e82e2b2eeeaaecccbe1ec098edd647d [diff] | |
parent | c854c108a2e7f12257607240fbf142552f26e7c5 [diff] |
[automerger skipped] Merge "Merge SP2A.220405.004 to aosp-master - DO NOT MERGE" am: c854c108a2 -s ours am skip reason: Merged-In I2a97159d0de32a6262bbace7bb82b09897447bdb with SHA-1 e75d9ee3e9 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2059150 Change-Id: I50b41ddcca4b5d93a80d7cb274c7bc6aee8e97cd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>