Jeff Sharkey 1aa2934cf2 Merge "video files with mimetype video/x-ms-asf can't scan to Gallery" into qt-dev ...

am: 6f574c4d3a

Change-Id: I50973ff724c5a3dbb65744be81c786de8956615d

2019-05-30 17:31:05 -07:00

..

apex/java/android/media

Merge "Change argument of MediaSession2.Builder#setExtras() as @NonNull" into qt-dev

2019-04-19 06:52:03 +00:00

java

Merge "video files with mimetype video/x-ms-asf can't scan to Gallery" into qt-dev

2019-05-30 17:31:05 -07:00

jni

Merge changes I4e32a588,I202c5653 into qt-dev

2019-04-08 18:15:39 +00:00

lib

Update signature files to the new format

2019-01-19 12:07:50 -08:00

mca

Add @UnsupportedAppUsage annotations

2019-03-22 11:43:11 +00:00

native

Adding "@defgroup" DOxygen tag to AMidi

2019-03-13 14:24:06 -06:00

packages/BluetoothMidiService

Convert Android.mk file to Android.bp

2019-03-12 11:30:43 -07:00

proto

Restrict updatable-media to android.media package.

2019-04-09 16:35:37 +01:00

tests

Merge "MediaFrameworkTest: Fix storage path" into qt-dev

2019-05-29 12:08:30 -07:00

Android.bp

Remove MediaPlayer2 from media apex.

2019-04-16 11:53:09 -07:00

OWNERS

OWNERS: add andrewlewis@google.com

2019-04-10 15:01:15 -07:00