tree b43f56aa86eef1f8ae95ea46beeaf04ee0741c68
parent 7e6c76ef7faf26aa1060b4abc1c65934b4e45338
author Erin Dahlgren <edahlgren@google.com> 1400889019 -0700
committer Ed Heyl <edheyl@google.com> 1403112285 -0700

Timeout on wait lock and throw exception to prevent ANR.

Change-Id: I5b0d2b8c0384d32ed0d870e5db6003991524fc38