data/videos removed
audio: add support for MSM audio formats

- Add support for EVRC, QCELP, and WMA formats
- Add definition for 5.1 channel recording
- Reference change If3676b88fa287b484ef8616c0a6b67177b61a720

Change-Id: I6b6e5ca98921adeadd2a3d76580fe85fb28eeaf0
(cherry picked from commit 10c4f204bb5ac78b9cf3854b536663ccd3d50333)
(cherry picked from commit 3f99cc5f134b0f00a52218ae1c0273cc11ae7702)
(cherry picked from commit 1d35b52c7c9cf1cfd3a3de372391a7a57f593af9)

Conflicts:

	media/java/android/media/MediaFile.java
audio: Define Proxy device

- Added Proxy device changes

Change-Id: I47921d696171de40bcfc30ebf99d4cafa0d4d4a3
(cherry picked from commit a8b7ed78ec088bc6924854661bacde51d7194ab3)
(cherry picked from commit cff61cfd964a1150919d9bfa7ec0ebfe35d5f247)
(cherry picked from commit bf8f7a2a574cb2e6aafae3efa6e4ee163ef65cf7)

Conflicts:

	media/java/android/media/AudioSystem.java
audio: audio enhancements for playback and recording.

- Add playback and record support for EVRC, QCELP,
  WMA, AMRWBPLUS, WAV, ACE, and EC3.
- Add support for 5.1 channel recording.
- Add support for in call music.
- Add constants for call_state and vsid.
- Add definition for FM and proxy audio devices.
- Remove unnecessary format checks in frameworks.

Change-Id: If3676b88fa287b484ef8616c0a6b67177b61a720
(cherry picked from commit 6ca6cc15af88992ea485a458e67a8546b156672e)
(cherry picked from commit f65028d1752969bf43c853c1bb12ecd12055d5e8)
(cherry picked from commit b1952442db41188b74f331bd2397a579424821ab)

Conflicts:

	media/java/android/media/AudioService.java
  audio: Support for MSM audio formats

  -Add audio format support for Voip.

Change-Id: Ie045ba926b3e1266afd3fb6fba09af3a55daaeef
(cherry picked from commit d1810964ecd2d50064a1fed51049ddc354b9a788)
(cherry picked from commit cd9c6dc56bedcabca77c2a01c6fb15f4d2e8edd5)
(cherry picked from commit 01c09aeae38716860ef1a806985cc946dca93f60)
audio: Add ifdefs for QCOM_HARDWARE audio features

Change-Id: I0ea423f9a28934dc1fee73bbb53c0d9d867877ff
ifeq QCOM: video: Add support for extended media listener

Bulid fails with error: 'MEDIA_QOE' was not declared in
this scope on other targets
Change-Id: Ic83be8f1acc4188b81fb903911023b39c614775b

Conflicts:

	media/jni/android_media_MediaPlayer.cpp
Re-add BOARD_USE_LEGACY_TOUCHSCREEN flag for the devices that needs it

Change-Id: I24ed882348ec5463910b5e49f849af2deac240a3

Conflicts:

	services/input/Android.mk
frameworks/base: media: add support for DIVX files

Change-Id: I6e922c5d6e17ee590606268af97b7894f35d19ae
(cherry picked from commit 47fea00316203aebba194644f95ca58ef4ff4400)
(cherry picked from commit 1f3ab64cf5bb19ec2e8a996750f44389d4d07187)
(cherry picked from commit 066dff510ec44ee06c3a375e32133e21fbedf9fb)

Conflicts:

	media/java/android/media/MediaFile.java
media: Configure audio encode parameters only for valid audio codec.

Added extra check for audio codec in profile
(Cherrypicked from commit eed39d0053dee6649424867418e511b918b3c634)

Change-Id: Ie1ac5252e3d544ce61af2b3ae5080ec9c6966e44
(cherry picked from commit 81dfde16ffb3fc8f6b110a3df2921a3d3361db10)
(cherry picked from commit 8069457a313853247f2017237e29bcf3b3eb2323)
(cherry picked from commit db4bf86a6b50ce84b5a678476ee08c12f0fe272b)
PhoneWindowPolicy: Fix NPE race condition by excessive screen on delay

When screen on has an excessive delay mTopFullscreenOpaqueWindowState could
not be initialized. This derives in a NPE from a Power key press. If
mTopFullscreenOpaqueWindowState = null then PREVENT_POWER_KEY can be safelly
ignored

Change-Id: I04ce5d88f6f9abf02b2bbcdce4a2acad2f6451fa
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>

Conflicts:

	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
"Clear all" button on recent apps

Port forward from cm-10.2

Change-Id: I9ebcf22f85957f61caefb14e0efd4cf2978d92cd

Conflicts:

	packages/SystemUI/src/com/android/systemui/recent/RecentsHorizontalScrollView.java
FrameworkBase: Fix aapt warnings [translation]

Change-Id: Ib376ad2d9899432615927e676ef712567127ea03

Conflicts:

	core/res/res/values-af/cm_strings.xml
	core/res/res/values-ca/cm_strings.xml
	core/res/res/values-da/cm_strings.xml
	core/res/res/values-fi/cm_strings.xml
	core/res/res/values-fr/cm_strings.xml
	core/res/res/values-hu/cm_strings.xml
	core/res/res/values-ja/cm_strings.xml
	core/res/res/values-nl/cm_strings.xml
	core/res/res/values-pl/cm_strings.xml
	core/res/res/values-pt-rPT/cm_strings.xml
	core/res/res/values-pt/cm_strings.xml
	core/res/res/values-sk/cm_strings.xml
	core/res/res/values-sv/cm_strings.xml
	core/res/res/values-zh-rCN/cm_strings.xml
Fix FindBugs issue

UsbStoreActivity: Null pointer derefence

Change-Id: I9d631c50c30eb98e32cca5a5085513b6904db676