OSDN Git Service

resolve merge conflicts of f79a82d6a to nyc-mr1-dev-plus-aosp
authorJosh Gao <jmgao@google.com>
Wed, 18 Jan 2017 23:39:44 +0000 (15:39 -0800)
committerJosh Gao <jmgao@google.com>
Wed, 18 Jan 2017 23:39:44 +0000 (15:39 -0800)
commit27cdfc3e9d7c71bd95639eb315fac2c36494e14e
treea9113a9eb15b4918daebec6b4e0f7c7d622c2eee
parent354b20fe5843444aad9e54ff60d9b73de24fb1e9
parentf79a82d6a25a64430c5e72b06016190ab07a5f48
resolve merge conflicts of f79a82d6a to nyc-mr1-dev-plus-aosp

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