Dianne Hackborn 711516d140 resolved conflicts for merge of 77fc8b80 to master ...

Change-Id: I014f9a886d6f05607d2a5d101ad2052a6841ee8d

2011-06-14 12:17:35 -07:00

..

android.hardware.audio.low_latency.xml

…

android.hardware.camera.autofocus.xml

…

android.hardware.camera.flash-autofocus.xml

…

android.hardware.camera.front.xml

…

android.hardware.camera.xml

…

android.hardware.faketouch.multitouch.distinct.xml

Fix issue #4582417: Need to add new PackageManager...

2011-06-08 20:38:41 -07:00

android.hardware.faketouch.multitouch.jazzhand.xml

Fix issue #4582417: Need to add new PackageManager...

2011-06-08 20:38:41 -07:00

android.hardware.faketouch.xml

Fix issue #4582417: Need to add new PackageManager...

2011-06-08 20:38:41 -07:00

android.hardware.location.gps.xml

…

android.hardware.location.xml

…

android.hardware.nfc.xml

…

android.hardware.sensor.accelerometer.xml

…

android.hardware.sensor.barometer.xml

…

android.hardware.sensor.compass.xml

…

android.hardware.sensor.gyroscope.xml

…

android.hardware.sensor.light.xml

…

android.hardware.sensor.proximity.xml

…

android.hardware.telephony.cdma.xml

…

android.hardware.telephony.gsm.xml

…

android.hardware.touchscreen.multitouch.distinct.xml

As of honeycomb, all touchscreen devices should also report faketouch.

2011-01-27 16:47:24 -08:00

android.hardware.touchscreen.multitouch.jazzhand.xml

As of honeycomb, all touchscreen devices should also report faketouch.

2011-01-27 16:47:24 -08:00

android.hardware.touchscreen.multitouch.xml

As of honeycomb, all touchscreen devices should also report faketouch.

2011-01-27 16:47:24 -08:00

android.hardware.touchscreen.xml

As of honeycomb, all touchscreen devices should also report faketouch.

2011-01-27 16:47:24 -08:00

android.hardware.usb.accessory.xml

Combine the USB accessory support library with the platform feature

2011-03-02 13:59:56 -08:00

android.hardware.usb.host.xml

Add platform features for USB host and USB accessory support.

2011-02-28 17:00:46 -08:00

android.hardware.wifi.xml

…

Android.mk

…

android.software.sip.voip.xml

…

android.software.sip.xml

…

handheld_core_hardware.xml

Add new landscape and portrait orientation features.

2011-06-14 11:23:52 -07:00

platform.xml

Interrogation of the view hierarchy from an AccessibilityService.

2011-06-06 18:46:03 -07:00

tablet_core_hardware.xml

Add new landscape and portrait orientation features.

2011-06-14 11:23:52 -07:00