OSDN Git Service

Resolve merge conflicts of 2387813 to nyc-mr1-dev-plus-aosp
authorFelipe Leme <felipeal@google.com>
Mon, 23 May 2016 21:18:16 +0000 (14:18 -0700)
committerFelipe Leme <felipeal@google.com>
Mon, 23 May 2016 21:19:23 +0000 (21:19 +0000)
commita7f6a4534c076ef4f84b7f08cbd507e50d71c04b
treede62282c1f8352995919ca86caf7ae2817ab56cd
parentad75bfca008317b0f2024e916f04ab8c4ebbe6c2
parent238781333c69fdf6b06a202877fdd9ef4902e0a7
Resolve merge conflicts of 2387813 to nyc-mr1-dev-plus-aosp

BUG: 28867848

Change-Id: I6893cab64078617c34a4256b394a3686287f6278
cmds/dumpstate/dumpstate.cpp