| commit | 3d51bc9d771a8c1795a7ac07dbd0727e3c9f5586 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Jun 17 19:57:53 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jun 17 19:57:53 2022 +0000 |
| tree | d6781c73f4b3038be1b9da62434de24ec098ed78 | |
| parent | 8201fc4a753710ad0c09dff5d988a3fd82fdd6aa [diff] | |
| parent | 64742ba78acc7b96ef4954d3b843dbb3e0feab92 [diff] |
[automerger skipped] Merge "Merge Android 12 QPR 3" am: 112278a600 -s ours am: ee78c6ef2e -s ours am: 64742ba78a -s ours am skip reason: Merged-In Iaa97a03bc18f72e3dfb4cc6600cbec8f2cc876e1 with SHA-1 2bdebb91e2 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2126005 Change-Id: I65494c130da89d2d5a0cf8a918beba4228b3c61b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>