OSDN Git Service

[automerger skipped] Merge changes from topic "trusted_overlay_backport" into rvc...
authorWinson Chung <winsonc@google.com>
Thu, 11 Nov 2021 19:40:54 +0000 (19:40 +0000)
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Thu, 11 Nov 2021 19:40:54 +0000 (19:40 +0000)
commitdae1a991ec26f7d959994e2c3255061f1b926efd
tree606db1411ef15f3818f34bcb150c4051aab1ad27
parent9761aa718c341c76a6ee3953f0988ced1a0a435e
parentcb15467837d25b5c77a9db85e663ebc234023b04
[automerger skipped] Merge changes from topic "trusted_overlay_backport" into rvc-dev am: 294e7b87e3 am: 90b88a978e -s ours am: cb15467837 -s ours

am skip reason: Merged-In I75be2b1d305e22f8a71532b9f5b8ea6c469baaaa with SHA-1 41f48c7b10 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/16224510

Change-Id: I3c9bba42b2f9b989b0cc2d2b91b3a3e938918752