| commit | cb805b35f3dcc96643d340c0a454931875948459 | [log] [tgz] |
|---|---|---|
| author | Benjamin Franz <bfranz@google.com> | Thu Jul 21 10:14:59 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jul 21 10:14:59 2016 +0000 |
| tree | 1c44f448aafc79863266697700c1f4dbc6b66bdd | |
| parent | a20314a28e9f53fe2e09feff06e96d29c5a061ab [diff] | |
| parent | 87534f4ac95ab481ca682ef34a7b6ee7767bbb3b [diff] |
Merge \\\"DO NOT MERGE Block the user from entering safe boot mode\\\" into mnc-dev am: 3e582390b3 am: 7abd7ba093 am: 87534f4ac9 Change-Id: I05e37f474e496b41c39b7a160418d9f48a265fa3