Merge "Merge "Remove FastJNI optimization on AssetManager to avoid dead lock." am: 4904e7ae2a am: 07acbea653 am: 0c4cace2a0 -s ours"
This commit is contained in:
committed by
Android (Google) Code Review
commit
43d059bf48