tree 0b0fd25e6deefb0ecb40c52bde528a4847c0fb0e
parent 81247500d535dac714fad657860b67474e1f6e42
parent 5f7111ff4dc5055298d302b228f392a7a22a00a0
author Mark Salyzyn <salyzyn@google.com> 1459866545 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1459866545 +0000

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