tree 5ed0a1c3bfd63ba3e2168383b90a515bb9241613
parent bc64d1d1fd12a0b43bcfe3f88698f29185ab63e0
parent 05d26211d8d310a30de05b06ce5807198e948f9d
author Christopher Ferris <cferris@google.com> 1423275519 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1423275519 +0000

Merge "Display errors instead of running infinitely."