| commit | 461309a63ab7881dfac07ca7e09318afad3039fc | [log] [tgz] |
|---|---|---|
| author | Benjamin Franz <bfranz@google.com> | Thu Jul 21 15:39:58 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jul 21 15:39:58 2016 +0000 |
| tree | 04b74776571b23975974367c19db69ab0a2d83cd | |
| parent | 4f93fdb999eb025de43a962a82ee6a6eb8be0074 [diff] | |
| parent | 662e2a79753eebc39899d4a363096f1cae6c9b43 [diff] |
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: I453d98b170f1383ad41f5e73b8f0818240f4778d