tree 7ca540b1499e6cf854ba995b6e37ac818d8b038f
parent 62c24d7bfa5a88655ba9981dba2a565c1136a255
parent 81b37d8bde34ef3bb8eb8dfd7492761a39a8fd09
author Gloria Wang <gwang@google.com> 1316131467 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1316131467 -0700

Merge "If media player has died already, do not dec the old surface texture reference. Otherwise segfault will occur. For bug 5327664. Do not merge." into ics-factoryrom