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

Change-Id: Id392b2e1990dc50b5d2d552f283a11a648d849a1

2016-10-18 11:55:04 -07:00

..

media

resolve merge conflicts of ffe502b to cw-f-dev

2016-10-18 11:55:04 -07: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