summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetManager2.cpp
diff options
context:
space:
mode:
author Helen Qin <helenqin@google.com> 2023-04-18 18:46:31 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-04-18 18:46:31 +0000
commitb8d51c4816abccf4e9990f1f6da7d114b1a3a246 (patch)
tree655b1780ba4c40b497b992a7516b523f73e0acfb /libs/androidfw/AssetManager2.cpp
parent53893d56eba80c4a7ba3fc0ac94c6f3e11134b3f (diff)
parent084406e75326718f1d1d8e7d35f5183a945d05a0 (diff)
Merge "Skip provider switching dialog when app sets a preferred default." into udc-dev am: 1ef0489d18 am: 084406e753
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22690094 Change-Id: I1ea038a9dc362212f6b96d398acb783193846413 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