Rob Carr 2ff633cbc3 Merge "Revert "Modify SurfaceView to use SurfaceFlinger child surfaces.""

2017-03-03 01:19:08 +00:00

..

media

Merge "Revert "Modify SurfaceView to use SurfaceFlinger child surfaces.""

2017-03-03 01:19:08 +00:00

mtp

resolve merge conflicts of b53d984 to master

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

service/media

Merge "Revert "MediaBrowserService: Add a constant for suggestion keywords""

2017-01-18 23:35:29 +00:00