diff options
| author | 2023-12-08 19:29:50 +0000 | |
|---|---|---|
| committer | 2023-12-08 19:29:50 +0000 | |
| commit | 0afab341524873957b5f8f4ffb8773bc374dd47c (patch) | |
| tree | 738cf1e398046968e36ee0cb7fc17207b573b5fd /libs/androidfw/AssetManager2.cpp | |
| parent | 2d0888c85868efe08febb808994a325486f4894e (diff) | |
| parent | 2f005a180631fe66e5ec321638a05f4887a967b2 (diff) | |
Merge "Sync core/java/android/security/flags.aconfig to AOSP" into main am: 2f005a1806
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2865027
Change-Id: Ibb27eba0c4ddc6676f0683e00b59357b7882fb22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AssetManager2.cpp')
0 files changed, 0 insertions, 0 deletions