Merge "Revert warning logic so it has a "don't show again" message." into nyc-dev

author TreeHugger Robot <treehugger-gerrit@google.com>

Wed, 13 Apr 2016 17:56:33 +0000 (17:56 +0000)

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

Wed, 13 Apr 2016 17:56:34 +0000 (17:56 +0000)
author TreeHugger Robot <treehugger-gerrit@google.com>
Wed, 13 Apr 2016 17:56:33 +0000 (17:56 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 13 Apr 2016 17:56:34 +0000 (17:56 +0000)
diff --cc packages/Shell/res/values/strings.xml
Simple merge
diff --cc packages/Shell/src/com/android/shell/BugreportProgressService.java
Simple merge
diff --cc packages/Shell/tests/src/com/android/shell/BugreportReceiverTest.java
Simple merge
author	TreeHugger Robot <treehugger-gerrit@google.com>
	Wed, 13 Apr 2016 17:56:33 +0000 (17:56 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 13 Apr 2016 17:56:34 +0000 (17:56 +0000)
		1	2
packages/Shell/res/values/strings.xml	patch \|	diff1 \|	diff2 \|	blob \| history
packages/Shell/src/com/android/shell/BugreportProgressService.java	patch \|	diff1 \|	diff2 \|	blob \| history
packages/Shell/tests/src/com/android/shell/BugreportReceiverTest.java	patch \|	diff1 \|	diff2 \|	blob \| history