audio: Fix for LPCM surround sound recording

 - Format WAVE was defined as 10, which is getting
 over-ridden by format THREE_GPP2 (which holds value 10),
 because of which Media recorder failed for LPCM SSR.
 - Fix this by defining format WAVE to 11.

Change-Id: I4db84441b70b28da3579e2ff430b42b2711f9404
Telephony: Add ME Depersonalization support.

Add support for all ME De-Personalizations as per specs
3GPP2 C.S0068-0 and 3GPP TS 22.022.

Change-Id: Iba74e3e5eb4fe96361585f4933897c5c8f17db97
CRs-fixed: 467276
Revert "frameworks/base: update library path name in Activity Trigger"

This reverts commit 7abea046455c1c8fc99126ae6cf9a6d4823ca50f.
Revert "frameworks/base: update perflock path name in Activity Trigger"

This reverts commit 4db57e5021c4091352f40f6e4399b0b929f63151.
Revert "ActivityTrigger:  New class to invoke when activity starts/resumes"

This reverts commit 71a57d30370584488a246a904750e7bdad5ba9a0.

Conflicts:
	core/jni/Android.mk
	core/jni/AndroidRuntime.cpp

Change-Id: Iaff445d0577ce8647690792a5460b5dee63ed37d
Merge "audio: Fix for LPCM surround sound recording"
Merge "Revert "frameworks/base: update library path name in Activity Trigger""
Merge "Revert "frameworks/base: update perflock path name in Activity Trigger""
Merge "Revert "ActivityTrigger:  New class to invoke when activity starts/resumes""
video: Add support for extended media listener

Added changes to handle additional message types for
dash playback.

Change-Id: Id07828866de8cae44137f26c1e74417aaa45704f
audio: Fix for volume level mismatch for AVRCP headset

-The volume level sent to AVRCP module from AudioService
 is incorrect.
-The volume level need to scale down for AVRCP module.
-Divide volume level by 10 to match AVRCP module volume
 levels.

Change-Id: Ieb8146797d0b552311b1a4782c45aea1be73e492
CRs-Fixed: 561649
Wifi: Fix for connection failure between third client and GC.

When third device sends a connection request to the group client, the
existing connection is terminating and also the ongoing connection not
successful.Currently as there is  no use case where third device is
connecting to GC,and the existing onnection getting terminated.This
is addressed by ignoring the new connection request from third client
to GC and the existing connection is intact.
CRs-Fixed: 467049

Change-Id: I784c38b9a4ca0c60b188b9697e3b4af4d09053cc
Merge "video: Add support for extended media listener"
base: Fix for wifi tethering crash

Pass network info along with CMD_UPSTREAM_CHANGED
Added a NULL check for Network info in CMD_UPSTREAM_CHANGED

CRs-fixed: 562910
Change-Id: I98bd37205255d9d4025cfb95b0688c68bce3c9bd
merge in klp-release history after reset to klp-dev
Set persist.sys.dalvik.vm.lib at system server startup

Bug: 11463182
Change-Id: I4409e84570c4e27bf8da36d0aca87812a1c032a6
Move set of persist.sys.dalvik.vm.lib to SystemServer only

Bug: 11463182
Bug: 11479647
Change-Id: I38efdecdd65fe3efc9c33b4dc204a64543ae6377
Merge "base: Fix for wifi tethering crash"
Show PIN on Peer device on receiving PIN display request.

P2P provision discovery would request the peer to display a PIN.
The PIN is displayed handling the request, the PIN need to be
entered on keypad of requested peer device to achieve the
connection.

Change-Id: I8b6487681d78eb10c558983a08dec1ac8a8eee65
CRs-fixed: 382608
wifi: Fix for connection between GO and p2p device

When GO sends an invitation request to the p2p device without
persistent profile, GO gets an invitation result=8 which means
unknown group, when GO receives invitation result 8, its tries
to remove persistent profile of the client but it will not be able
find the profile so it does continue with sending the invitation
so the connection fails. To address this, ignore if there are no
persistent profiles found for the client and continue with sending
the Invitation request to the client to make connection succesful
connection. As GO has single profile saved unlike client which
saves multiple profiles of GO.

CRs-Fixed: 511282
Change-Id: I78f54d4bb2f0d603bc2170ec2c3ef55a91050236