[automerger skipped] Merge "Revert "aacenc: fix timestamp off by one frame"" into qt-dev
am: b2f9f22c -s ours am skip reason: change_id I567890f3d04544c12adfe29a6a23c06f1db699e7 with SHA1 10ceef9f is in history Change-Id: Ic9241a858e34d4ccc8708ba9420b41700f4516a8
Loading
Please register or sign in to comment