Wipe and re-create database on downgrade.

Not a very common situation but should fix some errors that could
 arise from flashing an old ROM over a new one, without wiping data.

Change-Id: I27f2a00396761105987830921bb3f8cb339d2171
Revert "frameworks/base: media: add support for DIVX files"

This reverts commit 1cf37fe908ebe5743726bdae43cdafc497c4f1a1.

Change-Id: I32d7378f469166bc63b3aaa5a1e3e31ae1ec812a
Keyguard: Set WIDGET_CATEGORY_KEYGUARD when AppWidgetHostView is created

Allows the default lockscreen widget to inherit the keyguard widget
host category.  Without this, only widgets added through
KeyguardActivityLauncher are assigned the correct
OPTION_APPWIDGET_HOST_CATEGORY.

Change-Id: Ic97818d85ca5f00da0ce43bb36006d66a6935363
Fix for framework reboot on format of SD card

MountService is not aware of /storage/emulated/legacy path which is
causing the issue on ExternalStorageFormatter service. We are getting
the a list of non-emulated SD cards and format the first one .

Change-Id: Iba1a9f6e40499f7f6fb095a5ee4e711b02bed439
CRs-fixed: 489037
Bluetooth: HID: Add support for Set Idle and Get Idle Commands

This patch provides an interface for application to send Set Idle
and Get Idle commands to remote HID Device. Support for these
two commands was missing from exisitng code, so existing code
design is reused to add support for these two commands.

Change-Id: I548362cc328498920b2dae740f1a76b2cc2d6a67
CRs-Fixed: 522511
MAP: Add support for Connection ID

This patch adds support for connection identifier used while
sending put requests to MNS.

Change-Id: I016940d2ca023fc7d2e3da1c63e338e1528be147
CRs-Fixed: 518395
Hide new non-standard APIs and permission

These were breaking builds due to the public API modification

Change-Id: I603fcf0601f40fb315086859aa03ef5b7ec39248

Conflicts:
	core/res/AndroidManifest.xml