OSDN Git Service

resolve merge conflicts of 1750081 to nyc-dev-plus-aosp am: 261a733906
authorMark Salyzyn <salyzyn@google.com>
Tue, 24 May 2016 20:28:38 +0000 (20:28 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 24 May 2016 20:28:38 +0000 (20:28 +0000)
commiteffb7e8c15fca33dccdc17d818dddc53800c3e65
treecd339ff1455ac586be928a5d14626d838129c7ae
parentab76fa8bd5bbef0d0b9690d701077a766b1a61cc
parent718e76198b4fd94a94d5620d1a8785d0c319e612
resolve merge conflicts of 1750081 to nyc-dev-plus-aosp am: 261a733906
am: 718e76198b

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

Change-Id: I298d26bf09933048ffbb3f48dc905498de46adc2
cmds/dumpstate/utils.cpp