Merge "Add a filter to take out unnecessary homepage data."

author Fan Zhang <zhfan@google.com>

Tue, 9 Oct 2018 16:48:04 +0000 (16:48 +0000)

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

Tue, 9 Oct 2018 16:48:04 +0000 (16:48 +0000)
author Fan Zhang <zhfan@google.com>
Tue, 9 Oct 2018 16:48:04 +0000 (16:48 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 9 Oct 2018 16:48:04 +0000 (16:48 +0000)
diff --cc src/com/android/settings/homepage/CardContentLoader.java
Simple merge
author	Fan Zhang <zhfan@google.com>
	Tue, 9 Oct 2018 16:48:04 +0000 (16:48 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 9 Oct 2018 16:48:04 +0000 (16:48 +0000)