tree 821b1a1ed36e7fbdd38de6b2e0cc740a2d5caf7d
parent 60f7b58a9a10d1e163678c7c7a2a1cbc00634a72
parent 16c0c46f208c2a6b4d321352fbc5fc6acff6261e
author TreeHugger Robot <treehugger-gerrit@google.com> 1561062442 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1561062442 +0000

Merge "libmedia_jni pulls in libsfplugin_ccodec" into qt-dev