summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Jing Ji <jji@google.com> 2022-11-15 01:38:45 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-11-15 01:38:45 +0000
commit5d6bacbba7c2337d13af8514f82a3938b35c2850 (patch)
tree49521e11c2892137d6480874857226df867f50d7 /libs/androidfw/AssetsProvider.cpp
parent62ac7ec750b755ac0616696c2ac404143794ce37 (diff)
parent904cdb30c236a06062d6e0363848b3365a81c359 (diff)
[automerger skipped] Merge "DO NOT MERGE: Context#startInstrumentation could be started from SHELL only now." into rvc-dev am: ca7d20c52e am: b1003d47de -s ours am: 434c657230 -s ours am: 9b39c5f6b3 -s ours am: 076ca82a28 -s ours am: 904cdb30c2 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20308700 Change-Id: I287fad47419d91b9d85b498c9cc2762244af53b7 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