| commit | b8ae9d6f38279c6f1af59a4058c86e6092bd3525 | [log] [tgz] |
|---|---|---|
| author | Edwin Wong <edwinwong@google.com> | Fri Sep 02 20:11:02 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 02 20:11:02 2022 +0000 |
| tree | a4ddde95537f4268dc1264fa6842845abb146afa | |
| parent | 98ab72a26b79116b1d14e896527cb513833a0cdc [diff] | |
| parent | 4d804ad3190cabbdb3710bc888014b450d3683c0 [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: cbe0329167 -s ours am: 0fd10f21a3 -s ours am: 4d804ad319 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/19823968 Change-Id: I1ffea35e467a1f20fec010ced17ff9d54ce0f4bf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>