Merge "Add getVisualVoicemailPackageName() Make NMR2 voicemail columns public"

diff --cc api/current.txt
Simple merge

diff --cc api/system-current.txt
Simple merge

diff --cc api/test-current.txt
Simple merge

diff --cc core/java/android/provider/VoicemailContract.java
index e48a0d0,36f63b3..a8b094e
--- 1/core/java/android/provider/VoicemailContract.java
--- 2/core/java/android/provider/VoicemailContract.java
+++ b/core/java/android/provider/VoicemailContract.java
@@@ -317,9 -313,9 +313,9 @@@ public class VoicemailContract 
           *
           * <P>Type: INTEGER (boolean)</P>
           *
-          * @hide
+          * @see android.telephony.TelephonyManager#getVisualVoicemailPackageName
           */
 -        public static final String IS_OMTP_VOICEMAIL = "is_omtp_voicmail";
 +        public static final String IS_OMTP_VOICEMAIL = "is_omtp_voicemail";
  
          /**
           * A convenience method to build voicemail URI specific to a source package by appending

diff --cc telephony/java/android/telephony/TelephonyManager.java
Simple merge

diff --cc telephony/java/com/android/internal/telephony/ITelephony.aidl
Simple merge