Merge "Remove FastJNI optimization on AssetManager to avoid dead lock." am: 4904e7ae2a am: 07acbea653

am: 0c4cace2a0  -s ours

Change-Id: Icbbbc4f885c3839dcbc6c695c2ee3d16c78abf92
This commit is contained in:
Tim Zhang
2017-03-01 23:58:32 +00:00
committed by android-build-merger

Diff Content Not Available