Lajos Molnar 1d356c895b Merge \"media: clarify notes in MediaCodec doc\" into nyc-mr1-dev ...

am: 82d886434d

Change-Id: Iacc43f3db9a41a0373227fc09f3590cf275ec34f

2016-07-15 00:35:12 +00:00

..

java/android

Merge \"media: clarify notes in MediaCodec doc\" into nyc-mr1-dev

2016-07-15 00:35:12 +00:00

jni

Merge \"MediaDataSource: add DrmInitialization for IDataSource.\" into nyc-mr1-dev

2016-07-13 02:09:07 +00:00

lib

Unbundle RemoteService on TV - part 3

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

mca

resolve merge conflicts of 1599b981 to nyc-dev-plus-aosp

2016-04-28 12:08:15 -07:00

packages/BluetoothMidiService

…

tests

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

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