Merge remote-tracking branch 'replicant/replicant-4.2' into replicant-6.0

ril and vibrator do not work

Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>

Conflicts:
	cm.mk
	i9300.mk
	include/telephony/ril.h
	init.smdk4x12.rc
	overlay/frameworks/base/core/res/res/values/config.xml
	system.prop

1 files changed, 24 insertions, 0 deletions

diff --git a/usr/idc/melfas_ts.idc b/usr/idc/melfas_ts.idc
new file mode 100644
index 0000000..703e73b
--- /dev/null
+++ b/usr/idc/melfas_ts.idc
@@ -0,0 +1,24 @@
+# Copyright (C) 2010 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#
+# Input Device Configuration File for the Atmel Maxtouch touch screen.
+#
+# These calibration values are derived from empirical measurements
+# and may not be appropriate for use with other touch screens.
+# Refer to the input device configuration documentation for more details.
+#
+
+# Basic Parameters
+touch.deviceType = touchScreen