Merge "Take screenshot right away when invoked with -P."

author Felipe Leme <felipeal@google.com>

Tue, 8 Dec 2015 23:51:08 +0000 (23:51 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Tue, 8 Dec 2015 23:51:08 +0000 (23:51 +0000)
author Felipe Leme <felipeal@google.com>
Tue, 8 Dec 2015 23:51:08 +0000 (23:51 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 8 Dec 2015 23:51:08 +0000 (23:51 +0000)
diff --cc cmds/dumpstate/dumpstate.cpp
Simple merge
author	Felipe Leme <felipeal@google.com>
	Tue, 8 Dec 2015 23:51:08 +0000 (23:51 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 8 Dec 2015 23:51:08 +0000 (23:51 +0000)