tree fe3c68f59d51c33891077e8d416261be6a682e5b
parent 824b45f821c5f88a85c47af080191ea5cdcf65a1
parent 426a90e679c249b4307fa6fbb8e4cc62b2c1fdbd
author Wonsik Kim <wonsik@google.com> 1560223086 -0700
committer android-build-merger <android-build-merger@google.com> 1560223086 -0700

Merge "CCodec: fix i-frame-interval and aac configs" into qt-dev am: 7a92b009df am: 20f33e6ffc
am: 426a90e679

Change-Id: I2b823a44b68a5938e27f0a564df5a2d39728b6b1