| commit | 4050e6213fa99b9d94afffa5e1df772974f2f0d6 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Thu Jun 30 01:09:21 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jun 30 01:09:21 2022 +0000 |
| tree | 2530ee0673f7bf68488200a95a09710ac8eb58a4 | |
| parent | 03dce01ae0c42dbf4cdcbc1253e46ef17dae53a7 [diff] | |
| parent | 5b4ed1a169f460388a1d857b1126e032d99fc2fe [diff] |
[automerger skipped] Merge "Merge tm-dev-plus-aosp-without-vendor@8763363" into stage-aosp-master am: b296381136 -s ours am: c92e495db1 -s ours am: f3be57d347 -s ours am: 5b4ed1a169 -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: I2b26676986c6fa6b8cfc76886fe842c678cba5e5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>