ringtones: Rename 'Bootes' ringtone

* The 'Title' tag of this ringtone contains an umlaut, not all character
  sets seem to treat this properly, resulting in a corrupt title in the
  ringtone picker.

Change-Id: Iabfebc6326e53982ea9bc7bdea855e9f1ed436d4
Merge "ringtones: Rename 'Bootes' ringtone" into cm-10.2
MiniThumbFile: Fix image/bitmap retrieval

Change I66005dd69b0a5c8f4353bd7a8225d163a654fd2d changed the insertion
and creation indexing mechanism, but the retrieval method was still
using the old sparse one. Fixit

Fixes android.provider.cts.MediaStore_Images_MediaTest#testInsertImageWithBitmap,
android.provider.cts.MediaStore_Images_MediaTest#testInsertImageWithImagePath,
android.provider.cts.MediaStore_Images_ThumbnailsTest#testQueryExternalMiniThumbnails,
and android.provider.cts.MediaStore_Video_ThumbnailsTest#testGetThumbnail

Change-Id: I41feea79fa304635f3908055fb95a8c85718a97f
Merge "MiniThumbFile: Fix image/bitmap retrieval" into cm-10.2
merge changes from CyanogenMod 10.2 into local branch
Suspend Actions & Wakelock Blocker…

… [1/2] [log]

Change-Id: Ie63551e0e6f1a1ee5c2e16da441076557512936a

Conflicts:
	core/java/android/provider/Settings.java
	services/java/com/android/server/power/PowerManagerService.java