| commit | 16b096e6dd941c29643d7c74262707c232effdcb | [log] [tgz] |
|---|---|---|
| author | Sarp Misoglu <sarpm@google.com> | Mon Sep 18 14:22:52 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 18 14:22:52 2023 +0000 |
| tree | eb85f07986af2b73b78af1e5d3d51777ceb12c74 | |
| parent | e78317648d0d5a58f6476223fa0a95ed51c89a29 [diff] | |
| parent | c89b463461cead90900146d7c3327f3dc1209b49 [diff] |
Merge "resolve merge conflicts of 68b2b71f5114bb3788c95415459afe806cc57d12 to aosp-main-future" into udc-qpr-dev am: c89b463461 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24733751 Change-Id: I300207caa168b8f867b47359d08c74261fe32eb9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>