Merge branch 'cm-11.0' into kk_mkt

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

Change-Id: I672b545f1c04d40bb8d4fb93568eb51f9024c57d