tree c7f44c37e6d57241023f7e085bddd1ca2fbd305e
parent beb89e11ca777c92b7e2cc06c25f47d5a75ee7ad
parent 2f655daeea66bf5d0e065b45a7abd515cfeeaf97
author Mark Salyzyn <salyzyn@google.com> 1424972144 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1424972144 +0000

am 2f655dae: am bb67beca: Merge "dumpstate: add pstore read"

* commit '2f655daeea66bf5d0e065b45a7abd515cfeeaf97':
  dumpstate: add pstore read