Merge remote-tracking branch 'cm/cm-11.0' into HEAD

Conflicts:
	src/com/android/providers/downloads/DownloadNotifier.java

Change-Id: I139b01d1e2ac4ac761caa4999e9877dd47da4617