tree b0d39fd67a93c532a3321f922435e6b84b069460
parent b7319a7eb0a06ef4fd3a0c9157ee63e637ad7aa1
parent e532d37cf9342abbca398e4ce671b880369d90c6
author Lajos Molnar <lajos@google.com> 1370291448 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1370291448 +0000

Merge "stagefright: Fix port-reconfiguration & output-buffer-filled race condition" into jb-mr2-dev