Merge tag 'android-4.3_r3' into jb3

Android 4.3 release 3.0

Conflicts:
	core/java/android/net/ConnectivityManager.java
	core/java/android/net/IConnectivityManager.aidl
	data/sounds/AudioPackage11.mk
	services/java/com/android/server/AppOpsService.java
	services/java/com/android/server/ConnectivityService.java
Merge tag 'android-4.3_r3.1' of https://android.googlesource.com/platform/frameworks/base into jb3

Android 4.3 Release 3.1
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
Merge pull request #16 from jsnweitzel/jb3-test

OBEX: Implementation of MAP and PBAP client role on Bluedroid
Fix HTC headset handling.

HTC's headset driver adds additional bits to the switch state, which
we're unable to deal with. Fix that by masking out those bits and
keeping only the valid ones.

Change-Id: I29f0de9520ebb56d61acbc9a6dfcfc73e1f297d8
fix derp
Bluetooth: Support  HFP Client role on Bluedroid.

Implementation changes to support HFP Client role
on Bluedroid stack.

Change-Id: Ie37e95d3b0e3f785af818fb495c835e420792f4d
Merge tag 'android-4.3.1_r1' into jb3-test
[WIP] Multi-window

This is a big work in progress, which currently has some bugs,
but begins to look okay.

You can already multitask a little bit, by using the
app switcher and long-pressing an icon, then select "Add to
Split View".
Last window touched gets the key focus.

Still are some issues with rotation handling - touch an app
after rotation to make it relayout.

Enjoy :)

Change-Id: I4a03a84539fd3ac1273f0d3503fe8fafcd16be26

Conflicts:
	core/java/android/app/Activity.java
	core/java/android/app/IActivityManager.java
	core/java/android/content/Intent.java
	core/java/android/view/IWindowManager.aidl
	packages/SystemUI/res/values/custom_strings.xml
	packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java
	services/java/com/android/server/am/ActivityStack.java
[1/2] Add battery level around unlock ring

Change-Id: Ia4dbc2335657c096c34349ec67c4adfec0aeb91b

Conflicts:
	policy/src/com/android/internal/policy/impl/keyguard/KeyguardSelectorView.java
MediaRecorder: add pause interface

--add pause in java level
--add pause in jni level

Change-Id: I7f2d5d5ebb97716458b55a5780fd6cc3d09e9f11
Remote display framework support.

Any app can use the remote display APIs to mirror to another device...
This can be used to implement AirPlay, Chromecast, or even screen recording.

Change-Id: I6f45b393afb2f9d438d4aa548e8149946741c928

Conflicts:
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
Merge branch 'jb3-test' of https://github.com/sspencer10/android_frameworks_base into sspencer10-jb3-test

Conflicts:
	core/java/android/net/MobileDataStateTracker.java
	core/java/com/android/internal/widget/multiwaveview/GlowPadView.java
	packages/SystemUI/res/values/strings.xml
	packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java
	policy/src/com/android/internal/policy/impl/keyguard/KeyguardSelectorView.java
	services/java/com/android/server/WiredAccessoryManager.java
	telephony/java/com/android/internal/telephony/DctConstants.java