OSDN Git Service

resolve merge conflicts of 1750081 to nyc-dev-plus-aosp
authorMark Salyzyn <salyzyn@google.com>
Tue, 24 May 2016 20:17:53 +0000 (20:17 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 24 May 2016 20:17:53 +0000 (20:17 +0000)
commit718e76198b4fd94a94d5620d1a8785d0c319e612
treea072ac2ccc1581c388d80db840838557521ac8de
parent79cee840dcaee09851a800fcd0f6544473c701a5
parent261a733906981fc2390f0803effdc55c51842a5c
resolve merge conflicts of 1750081 to nyc-dev-plus-aosp
am: 261a733906

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

Change-Id: I1e4dbbfe6056023dedf954059422c321b3b80680