| commit | 1f0ac9da70d59bb6fcf3480fd47083287513b31b | [log] [tgz] |
|---|---|---|
| author | Edwin Wong <edwinwong@google.com> | Fri Sep 02 20:11:36 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 02 20:11:36 2022 +0000 |
| tree | b9e3fa10ab37f702f0077783e3c37c47074dfa54 | |
| parent | c9668c5946b38f79fb624e81760c6d664ac1f00b [diff] | |
| parent | 1f74d704d87292d3f36e4ab5265aadb9b3e6679d [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: 1f74d704d8 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/19823968 Change-Id: I5695b50037c7a1fc00eea45b2386f4f433e757f5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>