summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetManager2.cpp
diff options
context:
space:
mode:
author Yalan Yiue <yyalan@google.com> 2023-05-03 11:17:50 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-05-03 11:17:50 +0000
commitfd757406be006f92a2e59c81b58f47d21cac4269 (patch)
tree191b63592b613abda2b0f2178b71443b3f6a5830 /libs/androidfw/AssetManager2.cpp
parent29ce6c8b44ccbe6c8c30343214458487b3b64d6a (diff)
parentdfa60380ceda6d40d2f410445d673f8c3731c9ab (diff)
Merge "[MediaProjection] Remove filtering for cross-tab sharing" into udc-dev am: 6d7f698983 am: dfa60380ce
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22931516 Change-Id: I2c8cfb5d2efe72dcca8bddd2e4703063a3fce96b 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