tree fd5de112fddabfe58721a685287a90620787bba7
parent ec3ae45d3094c5564f2689ede3eded5926953297
parent c658aee7d6dc56b1b3b1722412029830e966ba71
author Mark Salyzyn <salyzyn@google.com> 1455038701 +0000
committer android-build-merger <android-build-merger@google.com> 1455038701 +0000

Merge changes I6b499f53,If821ed21
am: c658aee7d6

* commit 'c658aee7d6dc56b1b3b1722412029830e966ba71':
  dumpstate: report process times
  Add option to #define _DUMPSTATE_DRY_RUN_ to skip the actual dumps.