[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 8c886ae9 is in history Change-Id: I7ea414423ef5017c02e3e3b19ccc424240d4e6d2
Loading
Please register or sign in to comment