diff options
| author | 2023-05-19 12:26:49 +0000 | |
|---|---|---|
| committer | 2023-05-19 12:26:49 +0000 | |
| commit | af3b7d1ed0c14d9611336ee55a626696ad8ab0bb (patch) | |
| tree | dce9b4839742a4dd0ebc0ac4e206866ed34c6586 /libs/androidfw/ApkParsing.cpp | |
| parent | 191441622fea14f859bd45bb57fb3abd0368d929 (diff) | |
| parent | 19d4bc375053ef60f80d086b2470f5baf19679d0 (diff) | |
[automerger skipped] Merge "[MediaProjection][Security] Consistent locking on token" into udc-dev am: fcbbe3562a am: 19d4bc3750 -s ours
am skip reason: Merged-In I12506081e1d173e8210ff29ef3992c3bfcf82841 with SHA-1 f7634d8d2f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23243459
Change-Id: I97d3730228dc8ad23d87df286791f836c9dd2a43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ApkParsing.cpp')
0 files changed, 0 insertions, 0 deletions