Merge "Fix concurrency issues when parceling StatusBarNotifications." into jb-mr2-dev

author Daniel Sandler <dsandler@android.com>

Tue, 23 Apr 2013 00:53:31 +0000 (00:53 +0000)

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

Tue, 23 Apr 2013 00:53:31 +0000 (00:53 +0000)
author Daniel Sandler <dsandler@android.com>
Tue, 23 Apr 2013 00:53:31 +0000 (00:53 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 23 Apr 2013 00:53:31 +0000 (00:53 +0000)
diff --cc services/java/com/android/server/NotificationManagerService.java
Simple merge
author	Daniel Sandler <dsandler@android.com>
	Tue, 23 Apr 2013 00:53:31 +0000 (00:53 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 23 Apr 2013 00:53:31 +0000 (00:53 +0000)