vendor services (to arrays.xml)

Conflicts:

	core/res/res/values/arrays.xml
	services/java/com/android/server/SystemServer.java

Conflicts:

	core/res/res/values/arrays.xml
	services/java/com/android/server/SystemServer.java
1% battery

Change-Id: Ib2074c1d709cd386d53b56d4bb4fb1d937cb31ba
re-implement of ro.usb.use_custom_service (notification mass storage)
allow define mtp device
bootanimation: allow using RGB565 instead of ARGB8888

RGB565 uses considerably less memory, and together with texture
cache, it allows us to offer a really smooth bootanimation on
not so powerful devices.

Change-Id: I9da8fd7e6a587b5895519dd0983ec9b8f676771b

Conflicts:

	cmds/bootanimation/Android.mk
disable trace
Wifi: Fix the resume problem with wpa6 devices, for jb

Change-Id: I721d25a3d2de7794c80cc69114bdde83a8f40214
Add support for using a custom USB management service.
Some fixes for custom USB service handling.
Add LegacyUsbDeviceManager::setCurrentFunction method. (from ics, adapted to jb)
wifi: add rx filter init to fix broken unicast/broadcast (tiwlan)
LegacyUSBDeviceManager: reintroduce persist.service.adb.enable; observe...

Change-Id: I19c7609f93b1e68a9341fe367b2ff7b4d17008f2
Revert "disable trace"

This reverts commit 2029abe5bf70162a735f3f9aa85ac1a0fdb5957c.
Merge remote branch 'cyan/cm-10.1' into cm-10.1
Merge remote branch 'cyan/cm-10.1' into cm-10.1
Merge remote branch 'cyan/cm-10.1' into cm-10.1
Merge remote branch 'cyan/cm-10.1' into cm-10.1
Merge remote branch 'cyan/cm-10.1' into cm-10.1
Merge remote branch 'cyan/cm-10.1' into cm-10.1
Merge remote branch 'cyan/cm-10.1' into cm-10.1