tree 57e49da0b90565c76a1394b8a875fc22e9ae0369
parent 587e96145643ba7570730080aa4fe8865df3712a
parent 9b18bf92bf867b5c258b616e0ec39549ce9d03d4
author Mindy Pereira <mindyp@google.com> 1365535925 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1365535925 -0700

am 9b18bf92: am ffb60406: am 87a5af3e: Break out of infinite loop once we detect an error.

* commit '9b18bf92bf867b5c258b616e0ec39549ce9d03d4':