Commits

Amith Yamasani authored 2e804444d64
Handle the case where the restore environment doesn't have the ringtone Bug: 10130785 uncanonicalize() can return a null now, so abort restoring the ringtone in that case. Change-Id: I28765818c8d3e1fb3f271afdfe66ebc955cfcefe