summaryrefslogtreecommitdiff
path: root/libs/androidfw/BackupData.cpp
diff options
context:
space:
mode:
author Yao Chen <yaochen@google.com> 2023-09-30 06:03:06 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-30 06:03:06 +0000
commit1e33095a93978bed86dda62e7cd71303bc9e5ebc (patch)
tree2b81556229c63dc55b59f1e551773fb34cb2d002 /libs/androidfw/BackupData.cpp
parent8106a9d80cdda693be802ceb1d5fbca125d2f971 (diff)
parentb137c106b5450c0486a08bf44a27c077175925c7 (diff)
[automerger skipped] Merge "Use readUniqueFileDescriptor in incidentd service" into rvc-dev am: 61621c9510 -s ours am: b97477cde4 -s ours am: b4e7f02f13 -s ours am: a525c08da5 -s ours am: 372e2a4886 -s ours am: 3cc2961046 -s ours am: a6ab3cf357 -s ours am: 63d7a87792 -s ours am: d8b5d6766d -s ours am: eda650565b -s ours am: b137c106b5 -s ours
am skip reason: Merged-In Ibe03a17dee91ac5bf25d123d4fd9c0bdd3c7d80e with SHA-1 6fe53e86ed is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24607942 Change-Id: Ic9feab045a67b036cf538bb1fbe80a9b779515ad 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