tree f49fe6925c368c77978949cc4f4363b949f90579
parent 7a0e398867e53da38ad6b9d7ab82f5e094247e65
parent b2f9f22cfa3b3d11a233b36aa2e7058867b3d777
author Akshay Thakker <aksh@google.com> 1565644333 -0700
committer android-build-merger <android-build-merger@google.com> 1565644333 -0700

[automerger skipped] Merge "Revert "aacenc: fix timestamp off by one frame"" into qt-dev
am: b2f9f22cfa -s ours
am skip reason: change_id I567890f3d04544c12adfe29a6a23c06f1db699e7 with SHA1 10ceef9f3b is in history

Change-Id: Ic9241a858e34d4ccc8708ba9420b41700f4516a8