diff options
| author | 2019-09-04 17:11:16 -0700 | |
|---|---|---|
| committer | 2019-09-04 17:11:16 -0700 | |
| commit | 2904a62057cd16eaf653ee429d3de3218c3ca501 (patch) | |
| tree | 24f4f9f68124a63a0bcb9c72b6e0d345d0a56964 /libs/androidfw/AssetManager.cpp | |
| parent | 0b123e83a46b01bad083c297d1364fb4ad01d601 (diff) | |
| parent | add9e2eba9fe99091b539ec5caf008fc69f76a15 (diff) | |
[automerger skipped] Merge "fixes a security vulnerability in slice provider" into qt-dev am: bc59740fe4 am: e3f595c0a4 -s ours
am: add9e2eba9 -s ours
am skip reason: change_id Ib1b4fba54ebd3599fe11021d21dc9b09d34e8965 with SHA1 2b415a4c44 is in history
Change-Id: Ic415b5474b06cd115fb59c8adb107d34301bceb4
Diffstat (limited to 'libs/androidfw/AssetManager.cpp')
0 files changed, 0 insertions, 0 deletions