diff options
| author | 2023-10-11 23:45:41 +0000 | |
|---|---|---|
| committer | 2023-10-11 23:45:41 +0000 | |
| commit | e8352b003256d278b11044b38676ca58a7b49281 (patch) | |
| tree | 00aefa18af56fc5265a240f2ffd65d03c7ebb98e /libs/androidfw/FileStream.cpp | |
| parent | e6ae9185706006b79bc9c4e9f8d20e2ae91729ac (diff) | |
| parent | 745a97fb375a096551278f69ad81fdb67a478649 (diff) | |
[automerger skipped] Merge "[aapt2] Generate @FlaggedApi annotations" into main am: 5f951b7f6c am: 5fe48781b3 am: ca14f255ca am: acc50fd8a9 am: 745a97fb37 -s ours
am skip reason: Merged-In I0739f888d40269915c0acea5650c386da1a1782e with SHA-1 6fa7a3c7c5 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2783692
Change-Id: I6149c3c95c72748812e33e20cab35397cd78b391
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/FileStream.cpp')
0 files changed, 0 insertions, 0 deletions