NFC toggle fix

Remove logs

Change-Id: I94b9f058c6a2004fbebcec4d864abc6627a26eb7
Signed-off-by: Gergely Szell (sethyx) <szell@hu.ibm.com>
Updated simplified Chinese translations

Change-Id: I2d2b0de86a6535cfdde9cd83ecfd55e09fe75993
Merge "NFC toggle fix" into jb-mr1
Merge branch 'jb-mr1' of https://github.com/AOKP/frameworks_base into jb-mr1
LegacyUSB: Squashed commit with updates for 4.2

LegacyUSB: add overlay for UMS lun and use existence of lun to enable legacy USB

LegacyUSB: Add support for legacy USB implementations

Rebased for ICS 4.0.3

Option to hide Adb notification icon (framework) - authorship belongs to Rick C

Change-Id: Id14f70f7e21b689c08cadef69f69da711c7dc566
Add option for switching between UMS and MTP/PTP mode. (1/2)

Change-Id: I8e692d468cb36ccc97ca69b8a2eb11afeb711eae

This adds support for switching between UMS and MTP/PTP.
Framework part (this part) will only enable UMS if the config setting is set.
Standard is to enable UMS if the primary volume supports UMS.

It's only porting this http://review.cyanogenmod.org/#/c/21117/
Merge branch 'jb-mr1' of https://github.com/AOKP/frameworks_base into jb-mr1
Merge "Updated simplified Chinese translations" into jb-mr1
Merge branch 'jb-mr1' of https://github.com/AOKP/frameworks_base into jb-mr1