Elliott Hughes ea1831d211 am b57dd722: resolved conflicts for a884d81e to stage-aosp-master ...

* commit 'b57dd722f1dc0663417da37d3a82f8283ad3c982':
  constify JNINativeMethod function pointer tables

2015-09-24 17:14:10 +00:00

..

java/android

am 155c1ad1: am 38f6f487: am aef51d09: am 4a8034ca: AudioTrack: error reporting for getTimestamp()

2015-08-27 19:22:22 +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 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