tree ee144fb91555b05e0ad4dee1492733e338fc2634
parent ea22f8f61ed2c3bbda0c45b08934d1d84f107651
parent 419538869d3e92270f748316f4956eeb431663c3
author Mark Salyzyn <salyzyn@google.com> 1459867119 +0000
committer android-build-merger <android-build-merger@google.com> 1459867119 +0000

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

* commit '419538869d3e92270f748316f4956eeb431663c3':
  recovery-persist: pick up both pstore console files

Change-Id: I85571bfef8ab8f1a4f44c2a9138d3eaca78e57aa