Griff Hazen 6b7b34849a Merge commit 'e5b73ae2' into manualmerge ...

Conflicts:
	api/current.txt
	core/java/android/app/Notification.java

Change-Id: I3141ed6b456107b7e5aa8c0c9c98ffc1d77fdf75

2014-05-22 16:05:19 -07:00

..

current.txt

Merge commit 'e5b73ae2' into manualmerge

2014-05-22 16:05:19 -07:00

removed.txt

Revert "Remove the View#initializeScrollbars API"

2014-05-10 01:51:27 +00:00