tree 40a6aa44c6d24feb192e11da0382cdca9d16960e
parent 4f7634f203e61802940618985674eedaa14fbcd1
parent a6e7d260e8e4c93693c08effe2cd6ad9756065ee
author Karsten Tausche <karsten@fairphone.com> 1534323369 +0200
committer Karsten Tausche <karsten@fairphone.com> 1534323370 +0200

Merge the 2018-09-05 SPL branch from AOSP-Partner

* security-aosp-nyc-mr2-release:
  sonivox: prevent infinite loop in OTA ringtones
  sonivox: fix hang caused by bad meta-event

Change-Id: Ic2746a791f22a84c32d8c9bf63fa5eb8dd9f28f7