| commit | ec92ca8605e6d7638dd249060c0519666e8c94bf | [log] [tgz] |
|---|---|---|
| author | Borjan Tchakaloff <borjan@fairphone.com> | Mon May 14 21:59:32 2018 +0200 |
| committer | Borjan Tchakaloff <borjan@fairphone.com> | Mon May 14 22:00:15 2018 +0200 |
| tree | 9bd39ff1b60834fdee0ba092376ee983e9de4a74 | |
| parent | ebfe4bed0c3f14aab7f6b60c816b0f1b1305b1f5 [diff] | |
| parent | e74f53e7cd0f0c9d9dbffe98e81cecb248f4336a [diff] |
Merge the 2018-05-05 SPL branch from AOSP-Partner into android-7.1.2_r36 * origin/security-aosp-nyc-mr2-release: Fix SkFILEStream. Fix truncated webp images DO NOT MERGE Defend against ICOs with large BMPs embedded DO NOT MERGE Stop supporting kUnknown_BmpHeaderType DO NOT MERGE Set a limit on the size for BMP images DO NOT MERGE Issue: FP2N-106 Change-Id: Ibb1916231193b85c68037885c2422aa363d75f4c