Merge "Show a better list of apps." into lmp-dev

author Dan Sandler <dsandler@android.com>

Thu, 11 Sep 2014 11:58:54 +0000 (11:58 +0000)

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

Thu, 11 Sep 2014 11:58:55 +0000 (11:58 +0000)
author Dan Sandler <dsandler@android.com>
Thu, 11 Sep 2014 11:58:54 +0000 (11:58 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 11 Sep 2014 11:58:55 +0000 (11:58 +0000)
diff --cc src/com/android/settings/notification/NotificationAppList.java
Simple merge
author	Dan Sandler <dsandler@android.com>
	Thu, 11 Sep 2014 11:58:54 +0000 (11:58 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 11 Sep 2014 11:58:55 +0000 (11:58 +0000)