tree 4cf136a3124248a71129ddcad8f66fc17c7f3927
parent a182e12bf89eda717005a9804d944bf86ab1510f
parent 2cbff0edb67e47fb75f4142dce7ba104c6336fc7
author Andreas Huber <andih@google.com> 1275949319 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1275949319 -0700

am 2cbff0ed: Merge "Initial checkin of preliminary support for "http live" streaming in stagefright." into kraken