Elliott Hughes b57dd722f1 resolved conflicts for a884d81e to stage-aosp-master ...

Change-Id: Ice485967fa96f13786024b6939b826638e906ff0

2015-09-24 10:01:32 -07:00

..

java/android

am d9eef347: Merge "MIDI docs: fix buffer allocation" into mnc-dev

2015-08-21 23:31:48 +00:00

jni

resolved conflicts for a884d81e to stage-aosp-master

2015-09-24 10:01:32 -07:00

lib

Replace WIFI_DISPLAY_SETTINGS with CAST_SETTINGS.

2015-05-06 16:02:22 -07:00

mca

…

packages/BluetoothMidiService

MidiManager: proxy all requests to open devices through MidiService

2015-06-04 19:16:23 -07:00

tests

am 1017f986: Merge "Camera2: Add camera type to getNumberOfCameras." into mnc-dev

2015-08-15 00:54:18 +00:00