tree ee781ca37347edeb1492300c5b7482977cd08085
parent 57a6df47243b66ad23132030dd29bd9f2365e62d
parent 96a396daad8013d30c10fbef0b771766a0f58c7b
author Aaron Huang <huangaaron@google.com> 1644407945 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1644407945 +0000

[automerger skipped] Merge "Have FrameworksVcnTests access hidden API" am: ca1c4e2fc2 am: bde1da0e0a am: 6a152302ba am: 96a396daad -s ours

am skip reason: Merged-In I2e92f27b4d10612d9000c0fc0d5866dd0313a336 with SHA-1 023328e204 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1960194

Change-Id: I71fa2c512966a3b73fcf13501f70862af5793be1