tree 2cc4df097bd3ffdd66dd1a1e26ca2b10b0df7ab4
parent 0ebe5b44e1719b577796468defb1f9e1e0033625
parent c56f3bbfbafb6e01b2e2a3dbb1825fc7d0efcddc
author Mikhail Naganov <mnaganov@google.com> 1561407088 -0700
committer android-build-merger <android-build-merger@google.com> 1561407088 -0700

Merge "Revert "libmedia_jni pulls in libsfplugin_ccodec"" into qt-dev
am: c56f3bbfba

Change-Id: Ic3bc040b89c16abe53df4af8cf1f8c26dfcabfb5