summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Jing Ji <jji@google.com> 2022-11-14 22:44:55 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-11-14 22:44:55 +0000
commit72967ce86929f8585f3874710370c62ea8380169 (patch)
tree8ead2722432e898f4885b78f0eb1532f04e3fef2 /libs/androidfw/AssetsProvider.cpp
parent0c4ae957349bd8b3f999369e0dd3f08f646ca41e (diff)
parent8274886238906e3c72f2312bcbb06eb977b0f024 (diff)
Merge "DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now." into qt-dev am: 8274886238
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20283592 Change-Id: I00e1b07a3f5031661fa04732b79aa30fdaa1da1d 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