tree f1cb4b7d364ff875cd3cb8be3cbed57a8bd14931
parent dcc29b8ff5897c6bd094e643c404835aedf97ce0
parent 59a55b57bc8543ad0d080f117fc9ae53b1d95e1b
author Mark Salyzyn <salyzyn@google.com> 1459867291 +0000
committer android-build-merger <android-build-merger@google.com> 1459867291 +0000

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

* commit '59a55b57bc8543ad0d080f117fc9ae53b1d95e1b':
  recovery-persist: pick up both pstore console files

Change-Id: I94e04f486fed0bc79827a1805989424265afa28b