Alan Viverette 22b893fde1 Merge commit '096d52fb' into manualmerge ...

Conflicts:
	api/current.txt

Change-Id: Iaf1f9172a73e74885475c30ffefcb7d0e32a5883

2014-06-04 11:42:06 -07:00

..

current.txt

Merge "Ignore inPurgeable and inInputShareable."

2014-06-04 14:04:18 +00:00

removed.txt

Remove android.media.AudioFormat default constructor

2014-05-22 17:13:06 -07:00