Merge "Don't log metrics for initial screenshot." into nyc-dev

author Felipe Leme <felipeal@google.com>

Sat, 12 Mar 2016 00:38:33 +0000 (00:38 +0000)

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

Sat, 12 Mar 2016 00:38:34 +0000 (00:38 +0000)
author Felipe Leme <felipeal@google.com>
Sat, 12 Mar 2016 00:38:33 +0000 (00:38 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Sat, 12 Mar 2016 00:38:34 +0000 (00:38 +0000)
diff --cc packages/Shell/src/com/android/shell/BugreportProgressService.java
Simple merge
author	Felipe Leme <felipeal@google.com>
	Sat, 12 Mar 2016 00:38:33 +0000 (00:38 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Sat, 12 Mar 2016 00:38:34 +0000 (00:38 +0000)