tree d9879f5536f4cfd9adf0dbe6ea1a12f11efebb25
parent 194099d5e869379986d9092e419155371ef1b33a
parent 8bc24f5d220ce6c54b70aa8f6192cae1d33fa2e9
author TreeHugger Robot <treehugger-gerrit@google.com> 1483731354 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1483731359 +0000

Merge changes from topics 'Add/delete custom ringtones from storage', 'List parent profile custom ringtones from managed profile'

* changes:
  [RingtonePicker] Add and delete custom ringtones
  [RingtonePicker] Get cursor to list parent sounds