summaryrefslogtreecommitdiff
path: root/libs/androidfw/BackupData.cpp
diff options
context:
space:
mode:
author Yao Chen <yaochen@google.com> 2023-09-29 23:50:50 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-29 23:50:50 +0000
commit099b94340472b27900faed650e7e2e843be04161 (patch)
tree890197c71c11fe7e9e8d4b46cec7a4e5994d561a /libs/androidfw/BackupData.cpp
parent991b522507121650b782798ffa1c28c67d1026cd (diff)
parentd68be37f288939a6e77e0635afcd9a94ebc91d04 (diff)
[automerger skipped] Merge "Use readUniqueFileDescriptor in incidentd service" into rvc-qpr-dev am: cf1a6b6131 -s ours am: b4c962e9c2 -s ours am: ff77cd4970 -s ours am: 5b33166e7e -s ours am: d03ed52184 -s ours am: 7f3c529dd1 -s ours am: 1869619018 -s ours am: d68be37f28 -s ours
am skip reason: Merged-In Ibe03a17dee91ac5bf25d123d4fd9c0bdd3c7d80e with SHA-1 598dc664d4 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24608564 Change-Id: Ia7e2f517c023fe6e840e0828d1d2b3e51a600218 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/BackupData.cpp')
0 files changed, 0 insertions, 0 deletions