diff options
| author | 2019-08-07 10:06:38 -0700 | |
|---|---|---|
| committer | 2019-08-07 10:06:38 -0700 | |
| commit | 55189157a9e8b751d3b856b2695ba86a1494dcc6 (patch) | |
| tree | 5dfc78638f7c8e7800509cd0494ab757332d7d73 /libs/androidfw/AssetManager.cpp | |
| parent | 4fd6bf01d34868aaed45ad3987e2613c6b69a3f6 (diff) | |
| parent | aa22db3da7c657e8af128772b1df4757886c386c (diff) | |
Merge "Stop idmap2d after several seconds pass" into qt-r1-dev
am: aa22db3da7
Change-Id: Iadb3c2ef9dbb0863559d805fb2692dc8d6adcda5
Diffstat (limited to 'libs/androidfw/AssetManager.cpp')
0 files changed, 0 insertions, 0 deletions