summaryrefslogtreecommitdiff
path: root/tools/aapt/ResourceTable.cpp
diff options
context:
space:
mode:
author Yao Chen <yaochen@google.com> 2023-09-29 21:39:17 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-29 21:39:17 +0000
commitb4e7f02f1308eb6f15d276f3d5145691eff05c1b (patch)
tree1cd8a59a8964a9b358997e3558d17beff8231207 /tools/aapt/ResourceTable.cpp
parent275bc794ad0edc55bc4e707d73e7f80fc81b1033 (diff)
parentb97477cde41424530709cb08a9f35a8eec5161d2 (diff)
[automerger skipped] Merge "Use readUniqueFileDescriptor in incidentd service" into rvc-dev am: 61621c9510 -s ours am: b97477cde4 -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: I844458cf69909b722149969f7bad1bd9893a9c10 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'tools/aapt/ResourceTable.cpp')
0 files changed, 0 insertions, 0 deletions