tree fc7a8b8a941366f7f28397259a3bfa1ae753bd35
parent 8bba7510bc96d5404c070a4846318ee6a9eb1365
parent 3147523c107a5fecdccdc8083dea3124576331de
author Daniel Sandler <dsandler@android.com> 1366214673 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1366214673 +0000

Merge "Treat the default sound Uri the same as DEFAULT_SOUND." into jb-mr2-dev