OSDN Git Service

Merge \\\\\\"DO NOT MERGE Block the user from entering safe boot mode\\\\\\" into...
authorBenjamin Franz <bfranz@google.com>
Thu, 21 Jul 2016 15:50:39 +0000 (15:50 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 21 Jul 2016 15:50:39 +0000 (15:50 +0000)
commit1ca903022c3e8892ab09261de9bf752c24e588ef
treea71e88fc2db41d9e9f611c4bf0292b29c26ce04c
parentf472f858d3ec92543aef345f3714f75206b1ae24
parent461309a63ab7881dfac07ca7e09318afad3039fc
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
am: 461309a63a

Change-Id: Id36d384021feafabd71ff382ca8054da2f67a722