OSDN Git Service

Merge \"Explicitly sets dumpsys timeout.\" into nyc-dev
authorFelipe Leme <felipeal@google.com>
Wed, 8 Jun 2016 18:35:11 +0000 (18:35 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 8 Jun 2016 18:35:11 +0000 (18:35 +0000)
commit76614b0120a2603009105ce2ce323eb57c1ce7e1
tree758fe71b4bd25ad4f93215f8922f03aa3ae507b3
parent2fc9381a2a370142b3559c6c1445588643d6ae60
parent12af7d51a1a0c4e98955ae58a69552b8f55904eb
Merge \"Explicitly sets dumpsys timeout.\" into nyc-dev
am: 12af7d51a1

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