tree 14fb832b8fccf6839a772a8e369d8854b582e223
parent 3644001ea41d1b54407dc56fd914a9a257560aba
parent 16639a6e00d6f0f43486209795011f21ff0dc465
author Chong Zhang <chz@google.com> 1569154115 -0700
committer android-build-merger <android-build-merger@google.com> 1569154115 -0700

Merge "ACodec: read max pts gap and max fps keys for image encoders" into qt-qpr1-dev
am: 16639a6e00

Change-Id: I2b9a85c45dc8d7fe5a6c4993cb6679ff29b8db5d