Elliott Hughes 434a481b21 am ea1831d2: am b57dd722: resolved conflicts for a884d81e to stage-aosp-master ...

* commit 'ea1831d211ea0e6b2d161c714bb0786369ef2df5':
  constify JNINativeMethod function pointer tables

2015-09-24 17:23:00 +00:00

..

java/android

Merge "MidiService: update listener with current status when registered"

2015-09-22 22:15:14 +00:00

jni

am ea1831d2: am b57dd722: resolved conflicts for a884d81e to stage-aosp-master

2015-09-24 17:23:00 +00:00

lib

Replace WIFI_DISPLAY_SETTINGS with CAST_SETTINGS.

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

mca

…

packages/BluetoothMidiService

Merge "BluetoothMidiDevice: change write type to support JamStik"

2015-09-22 22:11:53 +00: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