summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetManager2.cpp
diff options
context:
space:
mode:
author Julia Reynolds <juliacr@google.com> 2023-09-05 20:20:13 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-05 20:20:13 +0000
commitb3f76e9d0dc7ba88fa246541ea415dbb8c3f1cad (patch)
treea8f01eadba0becf05e5fdae29a3d019e02022260 /libs/androidfw/AssetManager2.cpp
parentc909f2932230704bac8f54192e4dc535989e8ac8 (diff)
parentdf8862010c6edaa592adbc422d49ac67b063ad2e (diff)
Merge "Disable priority conversation widget for secondary users" into udc-dev am: df8862010c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24575247 Change-Id: Ia1d2b6825b9b232e6ea4f9285916a95553adcb4a 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