summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Jing Ji <jji@google.com> 2022-11-14 23:26:33 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-11-14 23:26:33 +0000
commit26059e9d29645593b73330cdaa4b9ff502ec77c2 (patch)
tree49521e11c2892137d6480874857226df867f50d7 /libs/androidfw/AssetsProvider.cpp
parent10f46e1917a64fffbcfe40f4f30df060b758e603 (diff)
parentfee2e7854789b8858e5d6551fdc4cf2f2cd0c11b (diff)
[automerger skipped] [automerge] DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now. 2p: 5985225e77 am: 3aefd55cf8 -s ours am: 3e3793070e -s ours am: fee2e78547 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20319635 Change-Id: Iba50c7d30b02560428c756c6632fe8245a271893 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