OSDN Git Service

am a5038d16: am a693a4b5: Merge "Fix ANRs due to Widevine DRM plugin sniff taking...
authorJeff Tinker <jtinker@google.com>
Fri, 9 Dec 2011 22:25:49 +0000 (14:25 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 9 Dec 2011 22:25:49 +0000 (14:25 -0800)
commit901e78d96eec495bda0dbe2e2b73009951301817
treece0df52bd6db87dbbd294b0b0260ec9af29dd3db
parenteebeceec684a36222b4559e3157b0db04c0a67ed
parentd276313bf895a6810404123c0affb4b7a6a07582
am a5038d16: am a693a4b5: Merge "Fix ANRs due to Widevine DRM plugin sniff taking too long." into ics-mr1

* commit 'a5038d169f47b2e2278c0056495dfd4808803f8a':
  Fix ANRs due to Widevine DRM plugin sniff taking too long.
media/libstagefright/AwesomePlayer.cpp
media/libstagefright/DataSource.cpp