rago de1fb0bbb8 resolve merge conflicts of a80bdc3 to nyc-mr1-dev-plus-aosp ...

am: addb7af2c0

Change-Id: I1ec6f29ee51d575002a50b305c2ac4a87afc5c3e

2016-09-16 01:49:47 +00:00

..

java/android

MediaExtractor: clarify EOS behavior for local files am: e6b987c569 am: 7709e7831e

2016-09-15 20:24:05 +00:00

jni

resolve merge conflicts of a80bdc3 to nyc-mr1-dev-plus-aosp

2016-09-16 01:49:47 +00:00

lib

Unbundle RemoteService on TV - part 3

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

mca

Fix google-explicit-constructor warnings in media/mca.

2016-08-29 14:47:52 -07:00

packages/BluetoothMidiService

…

tests

Avoid JUnit4 collision in android-support-test, mockito-target

2016-08-25 19:37:46 +00:00