| commit | e17ccf5ec3172a68eefa589bfb50e3c9c79212b3 | [log] [tgz] |
|---|---|---|
| author | Gloria Wang <gwang@google.com> | Thu Sep 15 17:38:39 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 15 17:38:39 2011 -0700 |
| tree | 837e1d8c00cbf4815a91c20a2a1236554f648cc6 | |
| parent | 5e74fb2649df099ab35c1640aeaa39033a8ceb32 [diff] | |
| parent | f629de24fa861451b020be7c1ad13b1a6be14998 [diff] |
am 91849473: (-s ours) 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 * commit '918494732741c1fdceda6d2e4ea8930b559f26a4': If media player has died already, do not dec the old surface texture reference. Otherwise segfault will occur. For bug 5327664. Do not merge.