am 72a9510d: Merge "Add support for fatal errors to framework." into lmp-mr1-dev
authorJarkko Pöyry <jpoyry@google.com>
Fri, 30 Jan 2015 21:22:42 +0000 (21:22 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 30 Jan 2015 21:22:42 +0000 (21:22 +0000)
* commit '72a9510d9503034c678cdb18384b3fe19f124714':
  Add support for fatal errors to framework.


Trivial merge