am 09c4eaf7: am 7f9e9012: Merge "RingtoneManager: query results depend on...
am 09c4eaf7: am 7f9e9012: Merge "RingtoneManager: query results depend on caller permission" into mnc-dev
* commit '09c4eaf7':
RingtoneManager: query results depend on caller permission