| commit | 9a970aeaf82ccde470f0a23f9db5bd1d321cad9b | [log] [tgz] |
|---|---|---|
| author | Edwin Wong <edwinwong@google.com> | Fri Sep 02 19:25:13 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 02 19:25:13 2022 +0000 |
| tree | 9e90b9128fee2ccf267a60fcd1fce7c95ea87e9d | |
| parent | 0fd10f21a358223db55613a10d460194d69a02b1 [diff] | |
| parent | d344dffc387219f7f373a8d89dcdf5f4cab0e56b [diff] |
[automerger skipped] RESTRICT AUTOMERGE - resolve merge conflicts of dab37c25e3337387809fd35c7cd46abf76088b83 to qt-qpr1-dev am: ec0754c9b5 -s ours am: 8537cde345 -s ours am: b60b4588d5 -s ours am: d4e19b2899 -s ours am: 946443b1ed -s ours am: d344dffc38 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/19823968 Change-Id: I1363971e5b8dee33a184a12e04a699722e14572c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>