| commit | 520f718df19bfeccca881d0f323752ac69ffd22b | [log] [tgz] |
|---|---|---|
| author | Dan Willemsen <dwillemsen@google.com> | Tue Sep 12 22:11:01 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Sep 12 22:11:01 2023 +0000 |
| tree | 31b6bf49bb6aff9137eee51874e247acfe8c87da | |
| parent | 4ddda5ad1a93d311be638f5951e1e9d00d795abc [diff] | |
| parent | dcf1a24949aa6e8325a9b19cb6eca4768be1f2f3 [diff] |
Merge "resolve merge conflicts of 68b2b71f5114bb3788c95415459afe806cc57d12 to aosp-main-future" into aosp-main-future am: b6b5a8c1aa am: dcf1a24949 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24735248 Change-Id: Ie13bcf5becf53169ebb6f5d9c2f875dd9cb86b2a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>