| commit | 43d059bf486969912b404b9d5f11ac0d2b9e7b89 | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Wed Mar 01 23:59:13 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Mar 01 23:59:18 2017 +0000 |
| tree | 08091a71755f09959e02c21ded82b691daf08461 | |
| parent | f1d8cb26afe18e93062e78a0df6b64f2e7a08c47 [diff] | |
| parent | d2dc22282785f5adcfa461caab98fb85eb7d2f56 [diff] |
Merge "Merge "Remove FastJNI optimization on AssetManager to avoid dead lock." am: 4904e7ae2a am: 07acbea653 am: 0c4cace2a0 -s ours"