Attempt to fix CROM-23: Proximity sensor always on while the device is in standby
It seems like this is redundant. This has existed from the very first version of this file, created by David96 on 16-Dec-2013.

Change-Id: If3beff9f6e7d9fd89a3da9e88c1a315aca8be848
Support for SEEK on Android

Following apis have been introduced to support
SEEK (Secure Element Evaluation Kit) on Android:
1. transmitIccLogicalChannel
2. transmitIccBasicChannel
3. openIccLogicalChannel
4. closeIccLogicalChannel
5. getLastError
6. transmitIccSimIO
7. getATR

Conflicts:
	telephony/java/com/android/internal/telephony/ITelephony.aidl

Change-Id: Idca9b47daa646902b74e37e7841d9d1506610887
MSim: Add Multi Sim support for SEEK

MSim support for the following apis has been added:
1. transmitIccLogicalChannel
2. transmitIccBasicChannel
3. openIccLogicalChannel
4. closeIccLogicalChannel
5. getLastError
6. transmitIccSimIO
7. getATR

Change-Id: I14fd1ccc08a9c89d655c7eb9f92a194c82138d3b
InputDevices: Move AOSP strings

Change-Id: Ia1c1fcf54a0024f1cb3738ddeb353fa180f14e8c
Merge "Attempt to fix CROM-23: Proximity sensor always on while the device is in standby It seems like this is redundant. This has existed from the very first version of this file, created by David96 on 16-Dec-2013." into kk
Merge pull request #36 from CarbonDev/kk

update