kyle_tso baa1210d25 Merge "Support scanDirectories with JNI callback function" am: 5747c2b81c ...

am: 34be883ebd

Change-Id: I57a54d520cd953c7b99e6815e7894421166368d4

2017-12-06 03:42:11 +00:00

..

media

Merge "docs: Add note to getFrameAtTime() pointing to getScaledFrameAtTime()" into oc-mr1-dev

2017-12-01 19:29:13 +00:00

mtp

Merge "Support scanDirectories with JNI callback function"

2017-12-06 03:22:30 +00:00

service/media

Merge "MediaBrowserService: Clean up ConnectionRecord when browser is dead" into oc-mr1-dev

2017-09-05 20:40:25 +00:00