Merge "core: SK translations" into cm-10.2
Merge "Fix dock intent lookup." into cm-10.2
Revert "Ported: Bluetooth Message Access Profile (MAP) from CM9"

This reverts commit 0e5fdcffdd1c3f1292a7cfa04660c966f70c883a.

MAP: Support MAP Server role on Bluedroid with javax.OBEX lib.

Handle No END OF BODY for MAP 1.0 Server Get request. Only the
last packet need send the 0x49(End of Body). For intermediate
packets, we need to send 0x48 (Body).

Move definitions for MAP or FTP Service Specific UUID and
Request type for CONNECTION_ACCESS_REQUEST intent to
BluetoothExt APK.

Change-Id: I04cfeb8d53b8f8c19160a2de1eb448a7ec1f2c41
CRs-fixed: 504042
Fix for Concurrency issue reported in  525529

List of services mainted by ActivityManager may get
updated/iterated concurrently if serviceTimeout() is
scheduled simultaneously with launch/stop of new services
for the same package.To fix the issue ,iteration of
proc.executingServices set in serviceTimeout() is synchronized
with same lock used by updating the set during
start/launch of service.

CRs-fixed: 525529

Change-Id: Ic230ad0d16e6ec64a20cf394aa1c1ce777c37a2b
services: Fix the bug in NFC shutdown logic

nfcOff should be checked for NFC shutdown instead of radioOff,
which is used for radio status.

Change-Id: Iafd620dc89ae8bed7855e313676527d4de32cb7c
base: App crash when select suggestion's length more than specified.

App crashed by catch IndexOutOfBoundsException which raised
by check span range when select suggested string.The root
cause is that the editor will truncate the suggested string
which length is more than it specified, but it also set span
use the suggestion's original length.

Update the suggestion's real length after editor replace the
original string to suggested.

Change-Id: I2d765701934a9e68be172cb87a104590f3cdeceb
CRs-Fixed: 532211
OBEX: Implementation of MAP and PBAP client role on Bluedroid

Implementation changes to support MAP client and PBAP client
role on Bluedroid stack.

Change-Id: Ic75e0bea10b8420aef928d868cc25acd769d5620
CRs-fixed: 530274
Bluetooth: Add error handling for callbacks in bluetooth manager

This adds null pointer check for callback before using it.

Change-Id: Ic04e5e9c766b79c9bf483f19b3b3bd7e240b4693
CRs-Fixed: 542151
be more robust with handling unknown sensors

- add support for new sensors (post 4.3)
- don't crash when encountering an unknown sensor type
- clean-up

Bug: 9683153
Change-Id: Iecd883e8a7d0297be1bd2bd4f00c5cc3ffcbccfe
Merge tag 'android-4.3_r3.1' of https://android.googlesource.com/platform/frameworks/base into cm-10.2

Android 4.3 Release 3.1

Conflicts:
	core/java/android/net/IConnectivityManager.aidl
	services/java/com/android/server/AppOpsService.java
	services/java/com/android/server/ConnectivityService.java

Change-Id: Id980378cb850c329229f4e458035a14226a84bf1
Fix merge from android-4.3_r3.1

Change-Id: I8918574a6eb71502db1e79e3f1c862db715989d5