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


Trivial merge