Minor post-merge cleanup.

Change-Id: Ic65ef882b61aa6506d21bbe41b9ac8473a950591
Merge "Minor post-merge cleanup." into cm-10.2
merge changes from CyanogenMod 10.2 into local branch

Conflicts:
	services/java/com/android/server/NotificationManagerService.java

Change-Id: Ibc8f2f9d61d7c1b2dd822ffa9bb6bbe1b6387302