| commit | 4f7634f203e61802940618985674eedaa14fbcd1 | [log] [tgz] |
|---|---|---|
| author | Andrew Appleby <andrewa@fairphone.com> | Thu May 10 16:13:05 2018 +0200 |
| committer | Andrew Appleby <andrewa@fairphone.com> | Thu May 10 16:13:05 2018 +0200 |
| tree | e5e2ce326dac1fc5fbc1eb48f389f6d823dea8fb | |
| parent | 9037e0e00191ea76fbea1ee142226adceff54c96 [diff] | |
| parent | dafaa314060ff9145ad95bffea6971df6249a1e8 [diff] |
Merge remote-tracking branch 'origin/security-aosp-nyc-mr2-release' into android-7.1.2_r36 Merge the 2018-05-05 SPL branch from AOSP-Partner into android-7.1.2_r36. * origin/security-aosp-nyc-mr2-release: Add recursion limit to XMF_ReadNode Fix memory leak Fix interpolator Fix infinite recursion Check chunk size Issue: FP2N-106 Change-Id: Icefd135e5f488c5a957797244fce9f30599c54b9