tree 0b715054a6c32ce7534e0ba6525b6d820e56afd3
parent f387ea24af127de865d0fdf5c707dc95707c273b
parent 1fe5a1a9df9e83aa5b552bb1b9c52d879a2026c1
author Sean Stout <sstout@google.com> 1479416270 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1479416274 +0000

Merge "Changed two strings from using "ringtone" to "sound""