tree aa4005d7bc547bd7e9ff931f81691c3b8966ac9c
parent 9349093cd984523a9d4bab397cd092b33c04f27e
parent d08debcf42d820fa8ef9916077a7bfc0a36f2db5
author Lajos Molnar <lajos@google.com> 1437139455 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1437139467 +0000

Merge "MediaSync: fix flush handling and deadlock" into mnc-dev