Revert JWR changes

In preparation for android-4.3_r2.2 merge

Revert "JWR bits and pieces"

This reverts commit 8810633b80a595d941702489109bf546c44c37fc.

Revert "JWR changes"

This reverts commit a19586d967beb95742e7f32c26105974ed643ca9.

Revert "in blind hope this will fix JSS'es damned 2 second freeze-ups"

This reverts commit 6f8dd2c6b5f602d7ad088da2813782fe2d0ed2c9.

Change-Id: I913441e438ecea818a635f6a6f2dc29e0ff8db7b
Merge tag 'android-4.3_r2.2' of https://android.googlesource.com/platform/frameworks/base into cm-10.2

Android 4.3 release 2.2

Conflicts:
	services/java/com/android/server/NotificationManagerService.java

Change-Id: I5e6735274a0a62ad85f0dade69053054960aa859
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
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
Bluetooth: Add trust device feature.

Add set trust feature where the remote device is marked
as a trusted device for subsequent connection.

CRs-fixed: 523135

Change-Id: I9bde4d7dfe07d9d63b58a661ed2413f45501bd7b
Fix requery behaviour of MemoryCursor.

As we can't restore the contents of the cursor window, we need to keep
it on deactivation so we can restore it on requery().

Change-Id: I06f688bbe9120c307bdc3ddbc3833416becdec82

Conflicts:
	core/java/android/database/MemoryCursor.java