tree 34b3056aa39e2b0d2b3b50cfbc89c6e92575a180
parent e89f5d9ef38caec9240a74a9da7974ac5253f623
parent 4fd8374fd8ece64599089895d554be73743e7193
author Andreas Huber <andih@google.com> 1296072753 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1296072753 -0800

am 11934aa3: am 373d357a: Merge "More instrumentation to track down the hardware decoder not shutting down bug." into honeycomb

* commit '11934aa32102d56ea920b058cb3cc9a455cd2232':
  More instrumentation to track down the hardware decoder not shutting down bug.