Glenn Kasten 67ffd5e617 resolve merge conflicts of c76a3ac to stage-aosp-master ...

Change-Id: Ifff16bdc42e8326f3f60cf4b92688c445cb4db25

2016-08-17 13:28:04 -07:00

..

java/android

resolve merge conflicts of c76a3ac to stage-aosp-master

2016-08-17 13:28:04 -07:00

jni

Merge \"Report error correctly for the implementation of StreamInterface::GetData()\" into nyc-dev

2016-06-16 20:05:17 +00:00

lib

Unbundle RemoteService on TV - part 3

2016-04-22 12:21:34 -07:00

mca

Merge \"Disable warning triggered in Clang r271374\"

2016-07-19 23:41:20 +00:00

packages/BluetoothMidiService

BluetoothMidiDevice: change write type to support JamStik

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

tests

Merge "Code Patch for camera preview switch tests" into nyc-dev

2016-05-27 22:40:26 +00:00