tree 90a317645ebeef266028962f0f9222292cbc2841
parent ab3d733015191355bfae80e1a446099abac0fcde
parent 1ff0e3ad95797714c74164ffd3529c163a487f56
author Francesco Salvatore <francesco@fairphone.com> 1548430372 +0100
committer Francesco Salvatore <francesco@fairphone.com> 1548430372 +0100

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

* security-aosp-nyc-mr2-release:
  sonivox: prevent rejection of good but large MIDI files
  sonivox: prevent infinite loop in OTA ringtones
  Revert "sonivox: prevent infinite loop in OTA ringtones"

Change-Id: I7392bc736d7f941254089f3de63b1ded28b770e6