OSDN Git Service

Merge "Allow ogg files to be selected as ringtones" into oc-dev am: d44afb99c8
authorChristine Franks <christyfranks@google.com>
Wed, 10 May 2017 16:22:27 +0000 (16:22 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 10 May 2017 16:22:27 +0000 (16:22 +0000)
am: c8ae9d5a60

Change-Id: I878d4dce0113535d43b9cdc9fb7d230bb38082b7


Trivial merge