Merge "Add support for fatal errors to framework." into lmp-mr1-dev
authorJarkko Pöyry <jpoyry@google.com>
Fri, 30 Jan 2015 20:09:14 +0000 (20:09 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 30 Jan 2015 20:09:14 +0000 (20:09 +0000)

Trivial merge