Merge "Don't call exit() from signal handler."
authorJarkko Pöyry <jpoyry@google.com>
Sat, 21 Mar 2015 00:26:49 +0000 (00:26 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Sat, 21 Mar 2015 00:26:49 +0000 (00:26 +0000)

Trivial merge