OSDN Git Service

resolve merge conflicts of dfc9df4 to nyc-mr1-dev-plus-aosp
authorFelipe Leme <felipeal@google.com>
Mon, 28 Nov 2016 22:29:38 +0000 (14:29 -0800)
committerFelipe Leme <felipeal@google.com>
Mon, 28 Nov 2016 22:29:38 +0000 (14:29 -0800)
commit3069899688d42d372d860d06f592aa53678baae2
tree18a38e5175aba7546fab810bac5d3f944db37ce1
parent6d938865ea2861ae50c6041e3c3b3276b8dcf0e6
parentdfc9df466fdd6b830b500326a7368f0c46134e11
resolve merge conflicts of dfc9df4 to nyc-mr1-dev-plus-aosp

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