OSDN Git Service

Merge \\\\\"DO NOT MERGE Block the user from entering safe boot mode\\\\\" into mnc...
authorBenjamin Franz <bfranz@google.com>
Thu, 21 Jul 2016 15:39:58 +0000 (15:39 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 21 Jul 2016 15:39:58 +0000 (15:39 +0000)
commit461309a63ab7881dfac07ca7e09318afad3039fc
tree04b74776571b23975974367c19db69ab0a2d83cd
parent4f93fdb999eb025de43a962a82ee6a6eb8be0074
parent662e2a79753eebc39899d4a363096f1cae6c9b43
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