am 64c0c4da: am 6fd49936: Merge "Rename ALLOW_PARENT_APP_LINKING to...
am 64c0c4da: am 6fd49936: Merge "Rename ALLOW_PARENT_APP_LINKING to ALLOW_PARENT_PROFILE_APP_LINKING" into mnc-dev
* commit '64c0c4da':
Rename ALLOW_PARENT_APP_LINKING to ALLOW_PARENT_PROFILE_APP_LINKING