tree 0b0fd25e6deefb0ecb40c52bde528a4847c0fb0e
parent dc91161a56c74bb6c73560d728d92b115f0f6e75
parent 901f31531ba7b7e40e8a9c915467892997d176da
author Mark Salyzyn <salyzyn@google.com> 1459866953 +0000
committer android-build-merger <android-build-merger@google.com> 1459866953 +0000

Merge "recovery-persist: pick up both pstore console files"
am: 901f315

* commit '901f31531ba7b7e40e8a9c915467892997d176da':
  recovery-persist: pick up both pstore console files

Change-Id: I7febc439147995adc06b75d1b0de3d30f55719a9