summaryrefslogtreecommitdiff
path: root/libs/androidfw/ConfigDescription.cpp
diff options
context:
space:
mode:
author Yao Chen <yaochen@google.com> 2023-09-29 23:59:41 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-29 23:59:41 +0000
commit0601ff6c66285607994ba15df5ab3c2577e816e1 (patch)
tree8d38f9be795cbfb76f92027df3c26da30db62bf5 /libs/androidfw/ConfigDescription.cpp
parent10a886c4145e01a8a443ceaab847c3ccf5ad64ce (diff)
parent9e75ed66c54926e620ab1318839f2bee70a4bc2c (diff)
[automerger skipped] Merge "Use readUniqueFileDescriptor in incidentd service" into tm-dev am: 2ac86ba5c7 am: 58e1853aad -s ours am: 95ce9dcf54 -s ours am: 9e75ed66c5 -s ours
am skip reason: Merged-In Ibe03a17dee91ac5bf25d123d4fd9c0bdd3c7d80e with SHA-1 5ae8b8102c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24608667 Change-Id: I367ded411fe1e84d1b653ed1a07bd61e413544d3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ConfigDescription.cpp')
0 files changed, 0 insertions, 0 deletions