summaryrefslogtreecommitdiff
path: root/libs/androidfw/ZipFileRO.cpp
diff options
context:
space:
mode:
author Yi-an Chen <theianchen@google.com> 2024-03-26 20:06:18 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-03-26 20:06:18 +0000
commitebe2dfd45db42f7d7b7c602d89d2cb455277eb77 (patch)
treef8ef08fa39c20d4b6601901ea5fef5af263fb70e /libs/androidfw/ZipFileRO.cpp
parent3e9f2ebbce6837a93aa948033e7709612d3cc913 (diff)
parentb95a1baec193d2ab9949fed4f4ff7e4da2dc93c1 (diff)
[automerger skipped] Merge "Fix error handling for non-dynamic permissions" into sc-dev am: e09941cfb2 am: 54c767b369 am: 2c02137a36 -s ours am: 2bb0396b11 -s ours am: a24f025c51 -s ours am: f7a8efc491 -s ours am: 21903667a4 -s ours am: b95a1baec1 -s ours
am skip reason: Merged-In Ie2f43663bc71a06ffadb868d2d0eea5ee78f76e5 with SHA-1 528a87e90f is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/26297402 Change-Id: Ic7ed89df747430b21fe8abf93f2cdf6d43f5f4f8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ZipFileRO.cpp')
0 files changed, 0 insertions, 0 deletions