Skip to content
Commit 662e2a79 authored by Benjamin Franz's avatar Benjamin Franz Committed by android-build-merger
Browse files

Merge \\\\"DO NOT MERGE Block the user from entering safe boot mode\\\\" into... 

Merge \\\\"DO NOT MERGE Block the user from entering safe boot mode\\\\" into mnc-dev am: 3e582390 am: 7abd7ba0 am: 87534f4a
am: cb805b35  -s ours

Change-Id: Icbc3d0dbcce8e079a895f194c13a5fa35957bc09
parents 7dbcfcad cb805b35
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment