tree 4ff7603cc90756cf5aac08185c2a66f917eb4461
parent 4c8472edc76664445b6f06f923d0953c2dd19383
parent 7c5b8ae1f917b1c0292fc8680974207cddb91865
author Karsten Tausche <karsten@fairphone.com> 1563373721 +0200
committer Karsten Tausche <karsten@fairphone.com> 1563373721 +0200

Merge the 2019-08-01 SPL branch from AOSP-Partner

* security-aosp-nyc-mr2-release:
  Fixes a double free in ContentEncoding
  Check there is only one settings per ContentCompression

Change-Id: Ie6c576b0d7a31c6599cfda4ca717bc7c41d083cc