Andy Hung c6e0d5f125 resolve merge conflicts of ffe502b to cw-f-dev ...

am: 3dd656c624

Change-Id: I8217da44238234d4ba4c34ea76f5bd78fd7b87d2

2016-10-18 20:11:21 +00:00

..

media

resolve merge conflicts of ffe502b to cw-f-dev

2016-10-18 20:11:21 +00:00

mtp

Do not access MTP devices when disabled.

2016-09-30 22:24:23 +00:00

service/media

MediaBrowserService: Add more explanation on getBrowserRootHints()

2016-05-19 14:17:27 -07:00