tree 9f3e87112b5aae49989c74422c3c1801ee44f833
parent 34e5d967f4f8052e1909900a808b1ac931eb6914
parent 457d5ae3c9e40c8336b65ea954d1bd5ae1622917
author James Dong <jdong@google.com> 1276108170 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1276108170 -0700

am 457d5ae3: Fix a potential(observed sometimes) media server crash