Jeff Brown 4e5c089ef3 resolved conflicts for merge of 337e764d to master ...

Change-Id: I8168dbf42b68c2f7b5ccb300e0080dddc627af26

2014-04-11 01:33:20 -07:00

..

camera2

Merge "Camera2 API: enable burst capture and repeating burst."

2014-04-10 19:51:57 +00:00

display

resolved conflicts for merge of 337e764d to master

2014-04-11 01:33:20 -07:00

hdmi

Use build property for CEC device OSD name

2014-04-03 07:59:27 +09:00

input

resolved conflicts for merge of 337e764d to master

2014-04-11 01:33:20 -07:00

location

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00

usb

Add support for USB devices with multiple configurations and alternate interfaces

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

Camera.java

am 1555cec2: am ecad0541: Merge "DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values" into klp-dev

2014-03-25 20:11:12 +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

Revert "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor"

2014-04-05 06:14:24 +00:00

SensorEvent.java

…

SensorEventListener2.java

Fix registerListener and flush bugs.

2013-10-09 19:00:22 -07:00

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

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00

SerialPort.java

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00

SystemSensorManager.java

AArch64: Use long for pointers in hardware classes

2014-01-08 10:17:21 +00:00

TriggerEvent.java

…

TriggerEventListener.java

…