| commit | c92e495db1f9dafee08e6defbe8a9af875dbc014 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Wed Jun 29 22:17:33 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jun 29 22:17:33 2022 +0000 |
| tree | 4e0a7e0bb6002f307fb5b629caa7bbeb617905f8 | |
| parent | 1f9aae9d10253c8b0002e557e15a68e0f75316b4 [diff] | |
| parent | b296381136304b70aafba0a7ab8119c3856ebd3f [diff] |
[automerger skipped] Merge "Merge tm-dev-plus-aosp-without-vendor@8763363" into stage-aosp-master am: b296381136 -s ours am skip reason: Merged-In I0d776f3fbdbba925cf1ac272270fb36f286dff91 with SHA-1 436c4c88b8 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/19094728 Change-Id: I5588c5385ca64ce317d3ccf84e4846c2ca9dc343 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>