Merge "Merge mips setjmp/longjmp family."
authorElliott Hughes <enh@google.com>
Tue, 9 Dec 2014 01:18:32 +0000 (01:18 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 9 Dec 2014 01:18:32 +0000 (01:18 +0000)

Trivial merge