tree c40a5e84e352724b2c23d7f112e5e38cba0ebc9e
parent 41a9b3c81d8a9871ab02589c300fd5859c95792e
parent c89f9da0607936b0f3d90ccaeb672dc2f3a1bfd1
author Mark Salyzyn <salyzyn@google.com> 1509028381 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1509028381 +0000

Merge changes I30d6b530,Ie2e5872a,I313cfef2,I87dfb6a0,I70709ba5

* changes:
  bootstat: add shutdown,thermal,battery
  bootstat: add reboot,2sec
  bootstat: test: check ro.boot.bootreason in some tests
  bootstat: fix test regression (exec_background)
  bootstat: fix test regression (extra logging)