commit | fdcf2eed390a398a9e0e6b3c9d8cf2d3ac29e956 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Fri Apr 08 19:14:30 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Apr 08 19:14:30 2022 +0000 |
tree | 2766f64136baeda7e8b6cd3cd046910a2040dd8f | |
parent | 191b3c66f4d13e66a7e36e5bf75e3b707528fb9c [diff] | |
parent | ee5c8c915e82e2b2eeeaaecccbe1ec098edd647d [diff] |
[automerger skipped] Merge SP2A.220405.004 to aosp-master - DO NOT MERGE am: 35525a5617 -s ours am: ee5c8c915e -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: I24893b4908756aceef98fd3edf3ed0d68e5c27ae Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>