| commit | 02d282a0f340bdc94198396f5d90f0d1a37db2d3 | [log] [tgz] |
|---|---|---|
| author | Ryan Prichard <rprichard@google.com> | Tue Oct 17 23:33:56 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Oct 17 23:33:56 2023 +0000 |
| tree | d0af0b73367b63d32bd95f2a812b4507110ff4de | |
| parent | 50272b55cb912512371113ccd5330d05c35f07aa [diff] | |
| parent | c4ff7a546ad0ca8870d10c91ba0b35e5f4c3ffe3 [diff] |
[automerger skipped] Merge "[sf] Stop inheriting from std::unary_function" into udc-qpr-dev-plus-aosp am: c4ff7a546a -s ours am skip reason: Merged-In Ie16ada6f76bee7d9f248dc8349a095b50777c92d with SHA-1 ec8cc07d8a is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/24959807 Change-Id: I0dc0304f0faf3a505d28f9071c70f426e7d4d4c5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>