tree 7cf41284b185ca0bb151e1a8f87e025e1352e540
parent f096eca2412d1655c72d6e047025f791cd436797
parent b5c3948459bf9bc15ad6341660c17bfe825f703a
author Treehugger Robot <treehugger-gerrit@google.com> 1594851328 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1594851328 +0000

Merge "Revert "C2SoftHevcEnc: Increase supported resolution to 960x544"" am: 5bf1097c4f am: fd4eb82dca am: 0ab3022342 am: b5c3948459

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1363956

Change-Id: Ieed4732c4e280d87111490233e7c49e0dd63a5e6