Pavel Zhamaitsiak cef504f914 resolve merge conflicts of 68514d5325 to master. ...

Change-Id: Ifbd3766e8a799a72e49adcdc6c5d509f2b8b53a6

2016-01-13 00:08:41 +00:00

..

android/telephony

resolve merge conflicts of 68514d5325 to master.

2016-01-13 00:08:41 +00:00

com/android

Add methods to the API to retrieve voicemail notification settings.

2016-01-06 11:14:42 -08:00