commit | f898830e2f1f3a58f46ca5933dd85f82b8405eda | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Tue Aug 29 20:42:31 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 29 20:42:31 2023 +0000 |
tree | 9f1ae77819c580a8bedf4f6ddde8e83b9bc9e592 | |
parent | 907bbac5846839c75f8b5955cc227bba63779f30 [diff] | |
parent | e96cc05fa3f6fd045e35b182dc4d9a39c64f75bf [diff] |
[automerger skipped] Merge "Merge Android U (ab/10368041)" into aosp-main-future am: 78602c4852 -s ours am: 2eab76d2fd -s ours am: 992c65516d -s ours am: e96cc05fa3 -s ours am skip reason: Merged-In Ied8e295ae059db07463ba06d3e6d747659b2757f with SHA-1 ba248cd1e1 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/24182864 Change-Id: I3bf5c144f74118b2a9e0ffef2074ea08102d5b26 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>