tree 1ba26478f9bbc132c9347fae9b5f5ecd565657bd
parent 426a90e679c249b4307fa6fbb8e4cc62b2c1fdbd
parent aa86d9c223ddfab618fb21751263b9e64e879168
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1560222412 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1560222412 +0000

Merge "Merge "CCodec: fix i-frame-interval and aac configs" into qt-dev am: 7a92b009df am: d51d99d6ec" into qt-r1-dev-plus-aosp