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)
am: 662e2a7975

Change-Id: I453d98b170f1383ad41f5e73b8f0818240f4778d


Trivial merge