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

Skip to content
Commit effb7e8c 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 

am: 718e7619

* commit '718e7619':
  dumpstate: sscanf requires an asciiz string

Change-Id: I298d26bf09933048ffbb3f48dc905498de46adc2
parents ab76fa8b 718e7619
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