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.
This commit is contained in:
Jeff Tinker 2011-12-09 14:25:49 -08:00 committed by Android Git Automerger
commit bdb7342098

Diff Content Not Available