diff options
| author | Tim Zhang <tim.zhang@spreadtrum.com> | 2017-03-01 23:58:32 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-03-01 23:58:32 +0000 |
| commit | d2dc22282785f5adcfa461caab98fb85eb7d2f56 (patch) | |
| tree | 95317c8e7526c344caff11a93d1c465307170188 /tools/aapt2/diff/Diff.cpp | |
| parent | 0c3b6b3eec2216af4f7720360780a284e05583c0 (diff) | |
| parent | 0c4cace2a03622e4c45ddefc5050b257d46220d2 (diff) | |
Merge "Remove FastJNI optimization on AssetManager to avoid dead lock." am: 4904e7ae2a am: 07acbea653
am: 0c4cace2a0 -s ours
Change-Id: Icbbbc4f885c3839dcbc6c695c2ee3d16c78abf92
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions