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
tree: 6b58653090982dda0a28fa9efbb0e51d275fe05c
  1. camera_detect/
  2. overlay/
  3. rootdir/
  4. Android.mk
  5. device.mk