Merge branch 'int/p/fp2' into dev/p/fp2/fp_apps_bringup

* int/p/fp2:
  Telephony: Add default values for MMS UA string and UA profile url

Change-Id: I7ad160000b0b539be69a0cdce1c7c1ea6cd47aa8
diff --git a/device.mk b/device.mk
index 0a9cc70..ad28a08 100644
--- a/device.mk
+++ b/device.mk
@@ -384,3 +384,7 @@
 	sap.conf
 
 PRODUCT_PACKAGES += senread
+
+# Experimental OpenGL ES 3.0 support for Android 7 (and higher)
+PRODUCT_PACKAGES += \
+	init.fp.exp_gles3_setup.sh