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