OSDN Git Service

resolve merge conflicts of a97a282 to nyc-mr2-dev-plus-aosp
authorFelipe Leme <felipeal@google.com>
Tue, 25 Oct 2016 21:13:13 +0000 (14:13 -0700)
committerFelipe Leme <felipeal@google.com>
Tue, 25 Oct 2016 21:15:42 +0000 (21:15 +0000)
commit257cdc33dbfd9340d132af42c7d49d62551678d6
treeeaef6c5bfce560f1af2d3584927446d2844cc14e
parent22e91a5b8fa06c11b23826fb17570ce5a345d7ee
parenta97a2825092ace891e748a9af0d246ed429856b4
resolve merge conflicts of a97a282 to nyc-mr2-dev-plus-aosp

BUG: 32365477

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