Glenn Kasten 613c63c742 Merge "BluetoothMidiDevice: change write type to support JamStik" ...

am: 6079b990f1

* commit '6079b990f1461011a9dedb47cc65db1ce062e199':
  BluetoothMidiDevice: change write type to support JamStik

2015-11-02 23:06:04 +00:00

..

java/android

Merge "BLE-MIDI: change binding for BluetoothMidiService"

2015-11-02 23:04:42 +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

Add missing <string.h> includes.

2015-01-25 08:33:36 -08:00

packages/BluetoothMidiService

BluetoothMidiDevice: change write type to support JamStik

2015-11-02 13:31:29 -08:00

tests

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

2015-08-16 02:55:33 +00:00