| commit | 0eadbe6d369844485d36e45f2b4ca9770828ae52 | [log] [tgz] |
|---|---|---|
| author | Benjamin Franz <bfranz@google.com> | Thu Jul 21 15:39:52 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jul 21 15:39:52 2016 +0000 |
| tree | fdf7aa60afa3f92165e1deadb7c8f18dc84e53de | |
| parent | 199e855f9f51ffcf3802b26d7baaf90f89e67187 [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: Ib1fe35a3725c38157a0612d838aca173b77b5981