tree 689aba49c17cfd525c850ab75333d36bcaef1dfe
parent 5ae4f028fe05cf7263626774df5d8a4b44fb8e87
parent 69fb36f0d15c39b616e92642522f93f678bf3315
author Wonsik Kim <wonsik@google.com> 1564755052 -0700
committer android-build-merger <android-build-merger@google.com> 1564755052 -0700

Merge "aacenc: fix timestamp off by one frame" into qt-dev
am: 69fb36f0d1

Change-Id: Ifd0eee397dadf142f77b9c6df8e702bea1ada47c