summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Jing Ji <jji@google.com> 2022-11-14 23:50:21 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-11-14 23:50:21 +0000
commit8ddb18fb3e46c1873a171672f53ae0e15304d84a (patch)
tree38a16e7ec117d7569a020ea33f0b219c9d186671 /libs/androidfw/AssetsProvider.cpp
parentb1003d47dee42ff827010e72de1c3175a4bf7396 (diff)
parentb899c833126e7fd1b1d8950a1529307104f434bd (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 skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20283592 Change-Id: I584fd6edff8e35d805606db374b2145855514047 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