OSDN Git Service

resolve merge conflicts of 467ecaff0 to master
authorJosh Gao <jmgao@google.com>
Thu, 19 Jan 2017 00:01:25 +0000 (16:01 -0800)
committerJosh Gao <jmgao@google.com>
Thu, 19 Jan 2017 00:01:25 +0000 (16:01 -0800)
commit00ac89ebc39fd2841f543653f3518009a2fbd9d0
tree3a2b9ed5c848b332eb465de494398a88a0503c65
parentc62d02e0e5c7fd57e48b2206805169845a620ba6
parent467ecaff086c134640bed81ebe8d03ca73d3b339
resolve merge conflicts of 467ecaff0 to master

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