commit | cb15467837d25b5c77a9db85e663ebc234023b04 | [log] [tgz] |
---|---|---|
author | Winson Chung <winsonc@google.com> | Thu Nov 11 19:21:53 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Nov 11 19:21:53 2021 +0000 |
tree | 6ec84acf200277008bb4c9ddda855e866dae2134 | |
parent | 03179cb3c9cfcb34d5e77cb670f28a7fdf7f66af [diff] | |
parent | 90b88a978ed0138a25461f27cd54849635753115 [diff] |
[automerger skipped] Merge changes from topic "trusted_overlay_backport" into rvc-dev am: 294e7b87e3 am: 90b88a978e -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: I078c2d9eecb9e153824cd7ea381d2245c29bbd4d