commit | 02c3da84181aa7187024dbda6721df33e81f4bc3 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Fri Apr 08 19:46:26 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Apr 08 19:46:26 2022 +0000 |
tree | aac6275d39dc270382dd67bc80e9a74aedfc8ba5 | |
parent | 0b6bf0f2295fc2414603bc9b9333363a6f5cbe08 [diff] | |
parent | f1b2e36f3521fef57e80c54f07a15f63930e852d [diff] |
[automerger skipped] Merge SP2A.220405.004 to aosp-master - DO NOT MERGE am: 95267eaf87 -s ours am: f2b5cf274c -s ours am: f1b2e36f35 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2058929 Change-Id: Ia83fbc62654d03985f227bc403e7fc662b486a85 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>