summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetManager.cpp
diff options
context:
space:
mode:
author MÃ¥rten Kongstad <amhk@google.com> 2023-09-22 07:25:00 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-22 07:25:00 +0000
commit48567b752e376ac61ee33eb265ae9663969525e3 (patch)
treeae5553ca0bc2e58bb832836fcd1b4b363c6e9c1a /libs/androidfw/AssetManager.cpp
parent90948508a755dc6288d79d1985385999772b3b30 (diff)
parent0275f893c2b38a12221a40d9f46788521fa91a01 (diff)
Merge "Expand @FlaggedApi(FLAG) constants in API signature files" into main am: 779ebfb62b am: 0275f893c2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2759286 Change-Id: I29b4d2cf845030d88f030c5b6a16160367ed5888 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AssetManager.cpp')
0 files changed, 0 insertions, 0 deletions