Android 6.0.1 release 43 (MOB30J)

-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iEYEABECAAYFAlcn+/8ACgkQ6K0/gZqxDngeagCePtxlUAf+tst/1shNLpqiZaiv
 LYwAnA3zmeOA1zGXv54UbxcjldWWqeN6
 =lIlM
 -----END PGP SIGNATURE-----

Merge tag 'android-6.0.1_r43' into HEAD

Ticket: CYNGNOS-2373
Android 6.0.1 release 43 (MOB30J)

Change-Id: I1241266b370fb1ba0560217684002d01867a0c77

src/com/android/email/activity/ComposeActivityEmail.java

@@ -23,6 +23,7 @@ import android.view.MenuItem;
 import android.widget.EditText;
 
 import com.android.email.R;
+import com.android.emailcommon.provider.EmailContent;
 import com.android.mail.compose.ComposeActivity;
 import com.android.mail.utils.LogUtils;
 
@@ -68,4 +69,9 @@ public class ComposeActivityEmail extends ComposeActivity
             mBodyView.setSelection(mBodyView.getText().length());
         }
     }
+
+    @Override
+    protected String getEmailProviderAuthority() {
+        return EmailContent.AUTHORITY;
+    }
 }