summaryrefslogtreecommitdiff
path: root/libs/androidfw/ConfigDescription.cpp
diff options
context:
space:
mode:
author Yao Chen <yaochen@google.com> 2023-09-29 22:54:37 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-29 22:54:37 +0000
commitade8021f27a2c18e55b71cc0a6c7c77b507f7bee (patch)
treee6ee21c6555ba11085667bcebffa1701055cf15b /libs/androidfw/ConfigDescription.cpp
parent6d11294adcec58184f2c791bb08f479c292516aa (diff)
parentaf48d5b9002a9e29994686b56dad75aefbcad43b (diff)
[automerger skipped] Merge "Use readUniqueFileDescriptor in incidentd service" into sc-v2-dev am: 7071381e4c -s ours am: 7aeb7533c5 -s ours am: 20543d2dec -s ours am: 5aa9945a9d -s ours am: af48d5b900 -s ours
am skip reason: Merged-In Ibe03a17dee91ac5bf25d123d4fd9c0bdd3c7d80e with SHA-1 6fe75d9d37 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24605806 Change-Id: I91967596a47333b195a7e6aa2f1ecb0e4b3fe100 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