summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetManager2.cpp
diff options
context:
space:
mode:
author Naomi Musgrave <nmusgrave@google.com> 2023-05-03 10:59:33 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-05-03 10:59:33 +0000
commitd06805e69eb043fbc93123f1d61b514db59d77ec (patch)
treedde91b6b36e48a89668b76a4167b38c9304a4856 /libs/androidfw/AssetManager2.cpp
parenta0dc6829bd492e8ed3e134457660ceaef4b513db (diff)
parentc69f38a953806008162494b29d1e351de9eeebc0 (diff)
Merge "(4/N)[MediaProjection] Don't send result to server until setup ends" into udc-dev am: 5029af7cf3 am: c69f38a953
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22822436 Change-Id: Id30042fb856b44d6017f2963d88a4ea05644b8bd 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