tree fe3c68f59d51c33891077e8d416261be6a682e5b
parent f41ff6ebebde2fddb74e232e8e8ba165d78440e6
parent 825149efa177618dcb2ff84684e1179c9d162f61
author Wonsik Kim <wonsik@google.com> 1560223149 -0700
committer android-build-merger <android-build-merger@google.com> 1560223149 -0700

[automerger skipped] Merge "Merge "CCodec: fix i-frame-interval and aac configs" into qt-dev am: 7a92b009df am: d51d99d6ec" into qt-r1-dev-plus-aosp
am: 825149efa1 -s ours
am skip reason: change_id I95ad7638148dfdfe7ecb76e8b2682e86c23812e8 with SHA1 0080d7ec3d is in history

Change-Id: I8628636bf327f75053e7463efdb0eabe8967877f