diff options
| author | 2023-05-19 13:04:40 +0000 | |
|---|---|---|
| committer | 2023-05-19 13:04:40 +0000 | |
| commit | 58fc70705f0c7a8f13f206fbcbec449f509a1857 (patch) | |
| tree | 7a4da6bb63d84ee6ac95ade1054750a2a9ea7864 /libs/androidfw/ApkParsing.cpp | |
| parent | 4989f52302c1899949d2fb6e8a3a196c244ac50d (diff) | |
| parent | af3b7d1ed0c14d9611336ee55a626696ad8ab0bb (diff) | |
[automerger skipped] Merge "[MediaProjection][Security] Consistent locking on token" into udc-dev am: fcbbe3562a am: 19d4bc3750 -s ours am: af3b7d1ed0 -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: I6ca04a07620b6e77ab303d7a1aa5db8dc9ae54ad
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