summaryrefslogtreecommitdiff
path: root/libs/androidfw/ObbFile.cpp
diff options
context:
space:
mode:
author Jeff Chang <chengjeff@google.com> 2022-09-26 02:47:58 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-09-26 02:47:58 +0000
commit7de60a54671a81b1d8e93fce890dc6dbdeef9b64 (patch)
tree69cb8b40ce9901670a0e6e6eae45b86bce02d113 /libs/androidfw/ObbFile.cpp
parent42815bea3fc79036d91797d514a22d55fd182da8 (diff)
parent86138c26fd9c1e2efb3db3c07c9e6645d044d3bc (diff)
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Allow activity to be reparent while allowTaskReparenting is applied" into rvc-dev am: d667038512 am: 86138c26fd -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19947761 Change-Id: I1972c4e34d0ba0fed2997cd3e8ed8c1bc3ba69e0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ObbFile.cpp')
0 files changed, 0 insertions, 0 deletions