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:57:21 +0000 (15:57 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 21 Jul 2016 15:57:21 +0000 (15:57 +0000)
commitbbd1a113e872981ff4ae7d3cb06b5442504e8bc1
tree52f8647aadd0412dfe98b6c5f3ad055c8dda0d01
parenta276b1bdcd1bce88e4427b12cfb8e325baa384e7
parent1ca903022c3e8892ab09261de9bf752c24e588ef
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
am: 1ca903022c  -s ours

Change-Id: Ia7b3c9756c7224ac38c028d9018813442fe02436