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