tree 79a0d5d9803ffd5bfc358151a90396d11a5f34be
parent 0ce5c9846967ab5339de133cc75d933a9ff8dcfc
parent 0c124edf7c633588e300f1855d22739194ba7194
author Mark Salyzyn <salyzyn@google.com> 1450111947 -0800
committer android-build-merger <android-build-merger@google.com> 1450111947 -0800

Merge "dumpstate: Add security log dump" am: bc611a1d3e
am: 0c124edf7c

* commit '0c124edf7c633588e300f1855d22739194ba7194':
  dumpstate: Add security log dump