qinzhichao e5fb79bb2d Merge "Fix NullPointerException in MediaPlayer" am: c7c899bbe2 am: 15c9c1f8d1 am: 80713e98f7 ...

am: cec9c42498

Change-Id: I19ca9ac969eca57981fd00dcc89f6fa1c724650a

2017-01-04 17:41:53 +00:00

..

media

Merge "Fix NullPointerException in MediaPlayer" am: c7c899bbe2 am: 15c9c1f8d1 am: 80713e98f7

2017-01-04 17:41:53 +00:00

mtp

resolve merge conflicts of b53d984 to master

2016-12-22 12:00:24 -08:00

service/media

MediaBrowser: Introduce the search API

2016-12-12 11:27:33 +09:00