am b95bfb71: (-s ours) am fa14b807: Merge "Display explanatory text in \'App...
am b95bfb71: (-s ours) am fa14b807: Merge "Display explanatory text in \'App permissions\' settings when permissions policies are enforced" into mnc-dev
* commit 'b95bfb71':