Merge "DO NOT MERGE: Remove continuous sampling logic. This was added for dogfooding...

author Julius D'souza <jdsouza@google.com>

Tue, 27 Jun 2017 11:06:40 +0000 (11:06 +0000)

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

Tue, 27 Jun 2017 11:06:46 +0000 (11:06 +0000)
author Julius D'souza <jdsouza@google.com>
Tue, 27 Jun 2017 11:06:40 +0000 (11:06 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 27 Jun 2017 11:06:46 +0000 (11:06 +0000)
diff --cc core/res/res/values/config.xml
Simple merge
diff --cc core/res/res/values/symbols.xml
Simple merge
author	Julius D'souza <jdsouza@google.com>
	Tue, 27 Jun 2017 11:06:40 +0000 (11:06 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 27 Jun 2017 11:06:46 +0000 (11:06 +0000)
		1	2
core/res/res/values/config.xml	patch \|	diff1 \|	diff2 \|	blob \| history
core/res/res/values/symbols.xml	patch \|	diff1 \|	diff2 \|	blob \| history