Merge "Add check to allow notification listener packages to post >50 notifications...

author Justin Koh <justinkoh@google.com>

Wed, 20 Aug 2014 16:09:01 +0000 (16:09 +0000)

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

Sat, 16 Aug 2014 04:32:18 +0000 (04:32 +0000)
author Justin Koh <justinkoh@google.com>
Wed, 20 Aug 2014 16:09:01 +0000 (16:09 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Sat, 16 Aug 2014 04:32:18 +0000 (04:32 +0000)
diff --cc services/core/java/com/android/server/notification/NotificationManagerService.java
Simple merge
author	Justin Koh <justinkoh@google.com>
	Wed, 20 Aug 2014 16:09:01 +0000 (16:09 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Sat, 16 Aug 2014 04:32:18 +0000 (04:32 +0000)