tree 93758ab0765f681afe19dda63a92c2e844f40911
parent 1fa713654910739592d6e974c1542e2376ccc9ce
parent 21ebe2b8eede35d80c210cf36f994c0e5f74decd
author Justin Ho <justinho@google.com> 1288134657 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1288134657 -0700

am 1f61ad17: (-s ours) am 3810c08b: Merge "DO NOT MERGE - Fixing ringtones that were put in as notifications" into gingerbread