tree 7bca1316237090592c0fdc7b1fe1af8a294432d9
parent 2fa03e58d313144772d9e8bee44f64b039c45e20
author YorkShen <shenyuancs@gmail.com> 1574307375 +0800
committer chen <lucky-chen@users.noreply.github.com> 1574307374 +0800

Merge Release/20190925 into master (#3031)

* Fix Poplayer multi Thread Native Crash

* Revert "Fix Poplayer multi Thread Native Crash"

This reverts commit 1d857d3df7100f5fac3856668ad8e71672c870ed.

* [Android] fix memleak for apm