tree e762fb00a86999d4061ab74e6026b00a8cbad1cc
parent 74780e34822c70cfb7d65ab3ae4957feef0ffb52
parent b6b5eff984e86128ba8e0bfb2a53a6aab27afe89
author Martijn Coenen <maco@google.com> 1443204566 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1443204566 +0000

am b6b5eff9: (-s ours) am 1728de00: Merge "add recovery mechanism on CORE_RESET_NTF"

* commit 'b6b5eff984e86128ba8e0bfb2a53a6aab27afe89':
  add recovery mechanism on CORE_RESET_NTF