Merge \\\\\"DO NOT MERGE Block the user from entering safe boot mode\\\\\" into mnc-dev am: 3e582390b3 am: 7abd7ba093 am: 87534f4ac9 am: cb805b35f3 -s ours
am: 662e2a7975
Change-Id: Ib1fe35a3725c38157a0612d838aca173b77b5981
This commit is contained in: