commit | e84e35f23702e8ff335710d257fd4be69f9c09df | [log] [tgz] |
---|---|---|
author | Winson Chung <winsonc@google.com> | Thu Nov 11 20:03:20 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Nov 11 20:03:20 2021 +0000 |
tree | 280adf0e3208002af2bcabb691a1c2664452f492 | |
parent | 30c2e86caec998b286481c782ea30f02420e304c [diff] | |
parent | 9d2066ec3ac5b6c5524d21ddc89ade0c47d9ae76 [diff] |
[automerger skipped] Merge changes from topic "trusted_overlay_backport" into rvc-dev am: 294e7b87e3 am: 90b88a978e -s ours am: cb15467837 -s ours am: dae1a991ec -s ours am: 9d2066ec3a -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: I8dfd39c27669de4c46f03850d21b7232b553393d