tree 707a84f1825cea9277255142540be9a43020823d
parent ddc97ec48b47b208659335a93fa21bdf774d98a6
parent e86fe1d2cd3fe8570fc181058877ce2dc7b9216b
author Karsten Tausche <karsten@fairphone.com> 1527770154 +0200
committer Karsten Tausche <karsten@fairphone.com> 1527770213 +0200

Merge the 2018-05-05 SPL branch from AOSP-Partner into staging/n/fp2

* origin/security-aosp-nyc-mr2-release:
  String16: remove integer overflows
  libnetutil: Check dhcp respose packet length
  zip_archive: reject files that don't start with an LFH signature.
  Fix integer overflow in utf{16,32}_to_utf8_length
  Fix out of bound read in libziparchive

Issue: FP2N-106
Change-Id: I71933c515a0f958e02ed1e4af26b999a27665d12