OSDN Git Service

resolve merge conflicts of 1750081 to nyc-dev-plus-aosp
authorMark Salyzyn <salyzyn@google.com>
Tue, 24 May 2016 19:38:40 +0000 (12:38 -0700)
committerMark Salyzyn <salyzyn@google.com>
Tue, 24 May 2016 19:38:40 +0000 (12:38 -0700)
commit261a733906981fc2390f0803effdc55c51842a5c
treee61d0b450866c8a019f92314afe1938c931350b5
parentc51e7ff96d97cdcdd420f54df2c3171c1016b14b
parent175008167a78ca283a20a2e4a0887579fc579dc9
resolve merge conflicts of 1750081 to nyc-dev-plus-aosp

Change-Id: If25f336cfc2fa02cba863987da6f55647636417e
cmds/dumpstate/Android.mk
cmds/dumpstate/utils.cpp