commit | 1cf0c262298300cc2a42cb7d4550249e1180ee19 | [log] [tgz] |
---|---|---|
author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 30 01:04:39 2023 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Sat Sep 30 01:04:39 2023 +0000 |
tree | 2b81556229c63dc55b59f1e551773fb34cb2d002 | |
parent | f6b2b71a0b221233d0a521ef8008073482054976 [diff] | |
parent | 4a07e90428e2285472df25caf052c30e1e9514f0 [diff] |
Merge changes from topic "am-2e761c519ac5487eb01ad659547b6f70" into udc-qpr-dev-plus-aosp * changes: Merge changes from topic "am-6fc7342924244409af40625086a7ba59" into udc-d1-dev-plus-aosp am: 9165616f84 -s ours [automerger skipped] Merge "Use readUniqueFileDescriptor in incidentd service" into sc-qpr1-dev am: 34f6ef3664 -s ours am: 4a3587d70c -s ours am: 2230add689 -s ours am: eee8b8f052 -s ours am: 8ea60ca336 -s ours am: e7861a65a3 -s ours am: abb6a54f96 -s ours am: e56a310f1f -s ours