summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Jing Ji <jji@google.com> 2022-11-15 01:05:35 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-11-15 01:05:35 +0000
commit77a3d6346859c34fd5b0f6b3a61ba6acc16623ae (patch)
tree1dd1152e98e2e767ab2fe90684fa97cef51d8376 /libs/androidfw/AssetsProvider.cpp
parentc8640975fbaae5449dddaa165b7b23f609f9369e (diff)
parentaa38c573780e91a94ff7649e969def573bde4022 (diff)
[automerger skipped] DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now. am: 8c90891a38 am: 42c14393e6 -s ours am: 1d6a1c98a2 -s ours am: 11a01ff266 -s ours am: aa38c57378 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20308700 Change-Id: Ibf650da4c31ebbc8c2a07f7d228bab25a3843bd9 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