Merge "Add a deletion helper view for clearing space."

author Daniel Nishi <dhnishi@google.com>

Mon, 18 Apr 2016 16:43:26 +0000 (16:43 +0000)

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

Mon, 18 Apr 2016 16:43:26 +0000 (16:43 +0000)
author Daniel Nishi <dhnishi@google.com>
Mon, 18 Apr 2016 16:43:26 +0000 (16:43 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Mon, 18 Apr 2016 16:43:26 +0000 (16:43 +0000)
diff --cc AndroidManifest.xml
Simple merge
diff --cc res/values/strings.xml
Simple merge
author	Daniel Nishi <dhnishi@google.com>
	Mon, 18 Apr 2016 16:43:26 +0000 (16:43 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Mon, 18 Apr 2016 16:43:26 +0000 (16:43 +0000)
		1	2
AndroidManifest.xml	patch \|	diff1 \|	diff2 \|	blob \| history
res/values/strings.xml	patch \|	diff1 \|	diff2 \|	blob \| history