OSDN Git Service

resolve merge conflicts of f79a82d6a to nyc-mr1-dev-plus-aosp
authorJosh Gao <jmgao@google.com>
Wed, 18 Jan 2017 23:43:23 +0000 (23:43 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 18 Jan 2017 23:43:23 +0000 (23:43 +0000)
commit467ecaff086c134640bed81ebe8d03ca73d3b339
tree53f14da6fcf5b18f7ccf13b6cfb5f2a04e6dd8cb
parent295f4fdd48a347e8b165a0763dd5ad679dbcdb3a
parent27cdfc3e9d7c71bd95639eb315fac2c36494e14e
resolve merge conflicts of f79a82d6a to nyc-mr1-dev-plus-aosp
am: 27cdfc3e9d

Change-Id: I0219baebce53482f730cfb73ae600be01bbeb224
cmds/dumpstate/utils.cpp