summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetManager.cpp
diff options
context:
space:
mode:
author Jihoon Kang <jihoonkang@google.com> 2023-09-21 18:44:34 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-21 18:44:34 +0000
commit039b58a8e220c224bacde0733fea6c7ef0a31011 (patch)
treed329056426955884bf1e258382856f5eb933613b /libs/androidfw/AssetManager.cpp
parentbe6f1a19318715b1ac0696756e8b6ec8d6d93ec4 (diff)
parent6eaafcd258d812b0a0b0c28c703a0a023ae70484 (diff)
[automerger skipped] Merge "Move java_api_library modules to f/b/api/StubLibraries.bp" into aosp-main-future am: 6eaafcd258 -s ours
am skip reason: Merged-In I479ec3b1554dcc6630207c5f095c6f9d211b035b with SHA-1 fdebc334ee is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24818927 Change-Id: I777f583e4275cf5b232625957b135a047af1aa50 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