summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Jing Ji <jji@google.com> 2022-11-15 02:38:18 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-11-15 02:38:18 +0000
commit14d7170e62b57496dda496f3d294645a4a451826 (patch)
tree70f354ce02e625e2901a537aa54fbc530deaf56d /libs/androidfw/AssetsProvider.cpp
parent78a8aa8dd9decd61afd8d5c031ac69172fc9189e (diff)
parent54b53f3fddeb887c3fc0f4819a500791253effad (diff)
[automerger skipped] DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now. am: 2d20bee73d am: 0c4ae95734 -s ours am: b899c83312 -s ours am: 8ddb18fb3e -s ours am: 186100635a -s ours am: 7551bea4bf -s ours am: ff52c2b11a -s ours am: 2a3969ff66 -s ours am: 54b53f3fdd -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20283592 Change-Id: If5f520d4a147ad587c526bd99fc671f2de38ac89 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