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