diff options
| author | 2023-09-30 07:21:57 +0000 | |
|---|---|---|
| committer | 2023-09-30 07:21:57 +0000 | |
| commit | 98ea5587baef53e9d94b5ad121f4bc4ccf252e84 (patch) | |
| tree | 5b7865d0a0b10630bb84138bd6fabf30e1e4dda9 /libs/input/SpriteController.cpp | |
| parent | 5a904a95a8db99b5333c306530f4ceaba03bc339 (diff) | |
| parent | 1e33095a93978bed86dda62e7cd71303bc9e5ebc (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: 1e33095a93 -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: I8d565b91f662ed670073a275c09d48b322fe9e0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/input/SpriteController.cpp')
0 files changed, 0 insertions, 0 deletions