summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetManager2.cpp
diff options
context:
space:
mode:
author Eric Biggers <ebiggers@google.com> 2023-09-13 19:45:09 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-13 19:45:09 +0000
commit36a4442577e66659f9769c32b52315cec4a4acf6 (patch)
treeeeff78cd71afc1095b3d207510b7491fd3e38ba0 /libs/androidfw/AssetManager2.cpp
parentdcfe521e029c855a4c2f6a0e4d21d87626a1ffb9 (diff)
parent20bb26382d5244b979baa8a6d9a42cc92f208d5b (diff)
Merge "Add OWNERS for services/tests/mockingservicestests/src/com/android/server/trust" into main am: 545d845569 am: 20bb26382d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2748037 Change-Id: I12e7ad65356b5f257779106195243cb22ee36abe 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