summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-08-30 21:03:46 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2023-08-30 21:03:46 +0000
commit6ff030bdb761c540d29fd66560f3d8823c44922a (patch)
treecebf5f7ebdb3506f8a04d7e29a1bad666bac51eb /libs/androidfw/AssetsProvider.cpp
parentf23cbc7a2b07a0ed32083a8324293967e93258b3 (diff)
parentf5b72d95d5a0e583cc8a7f50016deb56f3c0004e (diff)
Merge changes from topic "am-1c4b4404c5d54bf59c85d2fd63e619b8" into udc-d1-dev-plus-aosp
* changes: Merge changes from topic "cherrypicker-L84000000961835147:N85300001385845465" into udc-dev am: 76eed81379 am: ea55c65378 Reland "Use reference counted pointers for ApkAssets" am: 1cf74939f4 am: 9ae55ba3d6 [res] Better native pointer tracking in Java am: b9ef411d0f am: 11cbc92e85
Diffstat (limited to 'libs/androidfw/AssetsProvider.cpp')
0 files changed, 0 insertions, 0 deletions