tree 68802067b6ae7b0b8bba3a7d17abebb222122961
parent 4add743111cfd558c7b1c95b0b58b90a53e7556a
parent 5d7c089cabe599c3c5614c53f5a94c8c2357340f
author Justin Ho <justinho@google.com> 1350404027 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1350404028 -0700

Merge "Update alarm sounds and tune some ringtones Bug: 7351672 Bug: 5502770 Bug: 7312457" into jb-mr1-dev