OSDN Git Service

resolved conflicts for merge of 04e13acd to master
authorChristopher Ferris <cferris@google.com>
Thu, 26 Feb 2015 19:01:57 +0000 (11:01 -0800)
committerChristopher Ferris <cferris@google.com>
Thu, 26 Feb 2015 19:01:57 +0000 (11:01 -0800)
commit123edd9f812c93973de923397f2a5cb6fdaa4135
treecf1451cf355bbc0e3cbdad0c4fe889abccdc4d93
parent59b0b568d0ce20394e6d491342ad0b06682dfa45
parent04e13acdbf208277cfea17d331e702ad6afd6603
resolved conflicts for merge of 04e13acd to master

Change-Id: I9bbc9907a5cbde8b374398493bc0dc6b056ea734
cmds/dumpstate/dumpstate.c
cmds/dumpstate/dumpstate.h
cmds/dumpstate/utils.c