summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Mariia Sandrikova <mariiasand@google.com> 2022-12-26 22:44:42 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-12-26 22:44:42 +0000
commit2c533174522b62a72fc2432de9f3c575324a39e3 (patch)
treefdbd40eab09409a440c2ed398fac5f7a08d42c3a /libs/androidfw/AssetsProvider.cpp
parentb5424c06779f114d89e64f464edd14a6970a7075 (diff)
parentca58c605a2513f60c126791caca658e840331bcd (diff)
[automerger skipped] Merge "Enable forced focus for resumed split screen activities" into tm-qpr-dev am: f1fc4e774a am: ca58c605a2 -s ours
am skip reason: Merged-In I5675b32fbb9f60a7373fadbce379d571168436e7 with SHA-1 f2a91a3dfd is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20620288 Change-Id: I7a66814db22f6ef6b73cbb377b43b12f122009b0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AssetsProvider.cpp')
0 files changed, 0 insertions, 0 deletions