am 0d5bd804: am aa1805de: am 08876d19: Merge "Update alarm sounds and tune some ringtones Bug: 73516727 Bug: 5502770 Bug: 7312457" into jb-mr1-dev
* commit '0d5bd804':
Update alarm sounds and tune some ringtones Bug: 73516727 Bug: 5502770 Bug: 7312457