Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit 98b6d798 authored by Mark Salyzyn's avatar Mark Salyzyn Committed by android-build-merger
Browse files

resolve merge conflicts of c1c11d20 to nyc-dev-plus-aosp. 

am: b01ccba9

* commit 'b01ccba9':
  dumpstate: report process times
  Add option to #define _DUMPSTATE_DRY_RUN_ to skip the actual dumps.
parents 3160835e b01ccba9
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment