RoboErik b59eacf5fe resolved conflicts for merge of a41f48f8 to master ...

Change-Id: Ida37d1eacf32a391cd1963e31f8fd76d97e9869a

2014-09-05 14:29:31 -07:00

..

media

resolved conflicts for merge of a41f48f8 to master

2014-09-05 14:29:31 -07:00

mtp

Make setServer() safe to call multiple times

2014-03-27 13:25:14 -07:00

service/media

rename SERVICE_ACTION to SERVICE_INTERFACE

2014-09-04 14:06:34 -07:00