| commit | 1f74d704d87292d3f36e4ab5265aadb9b3e6679d | [log] [tgz] |
|---|---|---|
| author | Edwin Wong <edwinwong@google.com> | Fri Sep 02 19:28:06 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 02 19:28:06 2022 +0000 |
| tree | 1071faa08cd71aa2646e9982cff06c2af24b8986 | |
| parent | 97deacc56a20dd7c6abed856c16d40d955441e7e [diff] | |
| parent | 9a970aeaf82ccde470f0a23f9db5bd1d321cad9b [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: 9a970aeaf8 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/19823968 Change-Id: I85f11d7c9becfb0430e197c091d038335a88e52d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>