| commit | 963a7ca0e6b34d2c161a9a58680d1af4c009e0df | [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 | d0f424a32fafc9f5c41a4e9b243b6d752ac09d85 | |
| parent | 7eaedf93ca8e46d0360e6d904abf38d969daa3f1 [diff] | |
| parent | 918494732741c1fdceda6d2e4ea8930b559f26a4 [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.