| commit | 6bfdee0bbf6e943a560f3df5df2b9e3714684cb5 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Tue Aug 29 00:40:43 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 29 00:40:43 2023 +0000 |
| tree | ac3ea0b5a1f8cec4bbdf977741b249ec6e95cc50 | |
| parent | dcc389b1e72f490c2adc24b87af91d31d5e3a351 [diff] | |
| parent | ddaee50504c7c29320632e9361a8820b5cac115f [diff] |
[automerger skipped] Merge "Merge Android U (ab/10368041)" into aosp-main-future am: 22d35f5ab5 -s ours am: ddaee50504 -s ours am skip reason: Merged-In I3c9e9d15786fbead1b874636b46844f6c24bccc2 with SHA-1 8a809c6e46 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24181342 Change-Id: I70c415c2073c2716c85174c420c0bd45eb548f2b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>