Colin Cross a42cb8b0e2 resolved conflicts for merge of a67e34c8 to master ...

Change-Id: I597525886260884c9b2dfc7945e01eb8138a58c2

2014-03-21 13:11:02 -07:00

..

camera2

Merge "Camera2: Update exposureTimeRange related docs"

2014-03-19 02:12:08 +00:00

display

am e2c9cd58: Merge "Refactor display manager service to new pattern." into klp-modular-dev

2014-01-18 01:53:32 +00:00

hdmi

Add HDMI-CEC service

2014-03-20 16:40:22 +09:00

input

Add stream-level suppression to vibrate/audio services.

2014-03-19 15:32:51 -04:00

location

…

usb

Add support for USB devices with multiple configurations and alternate interfaces

2014-02-27 09:59:02 -08:00

Camera.java

camera: Fix setParameters for Preview FPS single/range values

2014-03-20 00:21:44 +00:00

CameraInfo.aidl

…

CameraInfo.java

…

ConsumerIrManager.java

…

GeomagneticField.java

Tabs -> spaces in frameworks/base.

2014-02-25 09:49:29 -05:00

ICamera.aidl

…

ICameraClient.aidl

…

ICameraService.aidl

camera3: Pass vendor tags through binder.

2014-03-13 12:14:49 -07:00

ICameraServiceListener.aidl

…

IConsumerIrService.aidl

…

IProCameraCallbacks.aidl

…

IProCameraUser.aidl

…

ISerialManager.aidl

…

LegacySensorManager.java

…

package.html

…

Sensor.java

…

SensorEvent.java

…

SensorEventListener2.java

…

SensorEventListener.java

…

SensorListener.java

…

SensorManager.java

am e7f7af96: am 35c8ebab: Merge "take account of RotationVector\'s new extra parameter"

2014-03-11 00:11:05 +00:00

SerialManager.java

…

SerialPort.java

…

SystemSensorManager.java

…

TriggerEvent.java

…

TriggerEventListener.java

…