commit | f2b5cf274c67691ac0daa02a6a936ab598ff379a | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Fri Apr 08 18:31:19 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Apr 08 18:31:19 2022 +0000 |
tree | f79f0e06d388ca045fb04528722fc28ded5f04da | |
parent | e8b737cbd3d22216951438bb1df0e37f7851a287 [diff] | |
parent | 95267eaf870ed7314f3af85a5aca2b0c467c8fbb [diff] |
[automerger skipped] Merge SP2A.220405.004 to aosp-master - DO NOT MERGE am: 95267eaf87 -s ours am skip reason: Merged-In Iae1a66165221f45051be17c4d047b5bd5be3999b with SHA-1 c7fda7b570 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2058929 Change-Id: I2ef00440a4935d88da004b94f50a69a493606358 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>