tree 62267263a423392d6592626c748397585a971686
parent 03e634270d880407316b51fac2278e604fc82703
parent a693a4b5553584a01b8b6b3640dc0393d2d88f28
author Jeff Tinker <jtinker@google.com> 1323332182 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1323332182 -0800

am a693a4b5: Merge "Fix ANRs due to Widevine DRM plugin sniff taking too long." into ics-mr1

* commit 'a693a4b5553584a01b8b6b3640dc0393d2d88f28':
  Fix ANRs due to Widevine DRM plugin sniff taking too long.