Chris Elliott a6ed5dcd04 DO NOT MERGE Revert "MediaPlayer: Disable acquiring wakelocks based on property." am: 8e79dae3f6 ...

am: 087d30c142

* commit '087d30c14243f38c28793877b8e5ad12d3a2b269':
  DO NOT MERGE Revert "MediaPlayer: Disable acquiring wakelocks based on property."

2015-12-02 22:46:11 +00:00

..

java/android

DO NOT MERGE Revert "MediaPlayer: Disable acquiring wakelocks based on property." am: 8e79dae3f6

2015-12-02 22:46:11 +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