Alex Klyubin f271c6d266 resolve merge conflicts of b53d984 to master ...

Change-Id: I3fe63a5c0193c720b8ec4ca53834096de8433f26

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

..

media

Merge "Revert "Remove AmrInputStream"" am: e2d8581529 am: 01cb199bed am: 8b1eed4ee8

2016-12-14 17:19:46 +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