Alex Klyubin 05ecfd308d am 33d3c53d: resolved conflicts for merge of 517e0274 to lmp-mr1-dev-plus-aosp ...

* commit '33d3c53da021f0d044028860ace0f4ad817273f5':
  Move hidden ApplicationInfo flags into a separate field.

2015-02-11 20:47:31 +00:00

..

camera2

Merge "camera2: Formatting nitpicks."

2015-02-10 21:20:28 +00:00

display

Add a function to boost screen brightness temporarily.

2014-10-31 18:45:11 -07:00

hdmi

CEC: Do null/empty check against the parameter for checkRecordSource()

2015-01-29 16:28:37 +09:00

input

Respect intent-filter priority for system keyboard layouts.

2014-09-18 18:48:19 -07:00

location

Fixed a leak in GeofenceHardwareImpl.java.

2014-12-03 14:34:08 -08:00

soundtrigger

resolved conflicts for merge of 517e0274 to lmp-mr1-dev-plus-aosp

2015-02-11 12:37:12 -08:00

usb

MidiManager: Add USB peripheral MIDI support

2015-01-29 12:59:28 -08:00

Camera.java

camera2: legacy: disable shutter sounds unconditionally via camera2 api

2014-08-19 15:11:31 -07:00

CameraInfo.aidl

…

CameraInfo.java

…

ConsumerIrManager.java

…

GeomagneticField.java

resolved conflicts for merge of ee665151 to lmp-mr1-dev-plus-aosp

2014-10-02 14:32:37 +01:00

ICamera.aidl

…

ICameraClient.aidl

…

ICameraService.aidl

…

ICameraServiceListener.aidl

…

IConsumerIrService.aidl

…

IProCameraCallbacks.aidl

…

IProCameraUser.aidl

…

ISerialManager.aidl

…

LegacySensorManager.java

…

package.html

…

Sensor.java

Update API to contain new wrist tilt sensor type and string.

2015-02-10 20:43:44 +00:00

SensorEvent.java

…

SensorEventListener2.java

Sensor documentation fixes.

2014-10-13 22:25:46 +00:00

SensorEventListener.java

…

SensorListener.java

…

SensorManager.java

Update API to contain new wrist tilt sensor type and string.

2015-02-10 20:43:44 +00:00

SerialManager.java

…

SerialPort.java

…

SystemSensorManager.java

…

TriggerEvent.java

…

TriggerEventListener.java

…