diff options
| author | 2022-03-25 16:59:23 +0000 | |
|---|---|---|
| committer | 2022-03-25 16:59:23 +0000 | |
| commit | 04a9796560197600fc9e0149ab05f8cac483ad14 (patch) | |
| tree | 49bc5ace19140043fd82c73cfe63ccdf35bcc44f | |
| parent | 9bc939a9df79e0855568339fdccde22304f9ac56 (diff) | |
| parent | ed8d74bc2e18114e3ce5b090ba8de0619eb15441 (diff) | |
[automerger skipped] Merge changes from topic "untrusted-cap" into sc-v2-dev-plus-aosp am: ed8d74bc2e -s ours
am skip reason: Merged-In I3a74e1cc43a36171ee10fbf68c4bfff538eee661 with SHA-1 f9c9ddfb48 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17071470
Change-Id: Ib0d7dcc44b26dce14e9431d31cb7bb021150d477
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
0 files changed, 0 insertions, 0 deletions