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

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

resolve merge conflicts of 17500816 to nyc-dev-plus-aosp 

am: 261a7339

* commit '261a7339':
  dumpstate: sscanf requires an asciiz string

Change-Id: I1e4dbbfe6056023dedf954059422c321b3b80680
parents 79cee840 261a7339
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