diff options
author | Lajos Molnar <lajos@google.com> | 2013-06-03 13:34:42 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-06-03 13:34:42 -0700 |
commit | 04bd27134a8283ed7e219892ec4b2a77a8677ee1 (patch) | |
tree | f5692be561d5b560406b002ea63261c68e4ae9a5 /media | |
parent | 587f8425a9522b2d0fe1ae0d211a259ec83786d1 (diff) | |
parent | e64d41332776e3c91f51c3239589695bf2cd0aeb (diff) | |
download | frameworks_av-04bd27134a8283ed7e219892ec4b2a77a8677ee1.zip frameworks_av-04bd27134a8283ed7e219892ec4b2a77a8677ee1.tar.gz frameworks_av-04bd27134a8283ed7e219892ec4b2a77a8677ee1.tar.bz2 |
am e64d4133: am 25b5617c: Merge "stagefright: Fix port-reconfiguration & output-buffer-filled race condition" into jb-mr2-dev
* commit 'e64d41332776e3c91f51c3239589695bf2cd0aeb':
stagefright: Fix port-reconfiguration & output-buffer-filled race condition
Diffstat (limited to 'media')
0 files changed, 0 insertions, 0 deletions