tree 60faaad9ddd7c0acd7fe1903bf23e9cbd60ec404
parent ae5d17da8f82fbc70ee4fc53749c0f0e9aa711a1
parent 3df5ecdf906cbaaa689190e1026b02a13b9b7f12
author Alistair Strachan <astrachan@google.com> 1558745226 -0700
committer android-build-merger <android-build-merger@google.com> 1558745226 -0700

Merge "Revert "media: disable Codec 2.0"" into qt-dev
am: 3df5ecdf90

Change-Id: Ic90deb0086fe87290e5a601b811235163c93e1d2