commit | ee5c8c915e82e2b2eeeaaecccbe1ec098edd647d | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Fri Apr 08 18:31:20 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Apr 08 18:31:20 2022 +0000 |
tree | 1a76b4a0128bba6ef9fc216c0ec06ad872a42f31 | |
parent | 02701dd8b1a464ebaf204730bf22e986e93dc80a [diff] | |
parent | 35525a56171ff6f2cc5843098ada03ec36c9f6e6 [diff] |
[automerger skipped] Merge SP2A.220405.004 to aosp-master - DO NOT MERGE am: 35525a5617 -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: Iae1f5f9c4b22fdd8aa1e82185a64c07d8c65a979 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>