tree 3400fb46bc247f96d17b17463955ebbff1dd0e7b
parent 3c89a2e9d4ee10b9e955783af2ab9e9dd137922f
parent 6f505a4c0b91d88d2759fbd7e17d91f3ed715165
author Lajos Molnar <lajos@google.com> 1369854685 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1369854685 +0000

Merge "MediaMuxer: Remove SAMPLE_FLAG_SYNC flag" into jb-mr2-dev