OSDN Git Service

Merge \"Merge \\\"Block user from setting safe boot setting via adb\\\" into nyc...
authorBenjamin Franz <bfranz@google.com>
Fri, 22 Jul 2016 09:01:36 +0000 (09:01 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 22 Jul 2016 09:01:36 +0000 (09:01 +0000)
commit7b59930f3ad564ea4a14e2ffb912368ee8139620
treee66fc52406a522b679d5182c7c6751fe46f0a331
parent5c6d603134c513d576393565e3e39717c5b863bb
parent2b74cb0fca7ba8ed4adc275af40e146280b76baa
Merge \"Merge \\\"Block user from setting safe boot setting via adb\\\" into nyc-dev am: f97faada5d am: 6b69f6597e\" into nyc-mr1-dev-plus-aosp
am: 2b74cb0fca

Change-Id: I064088228c8469d9cecebe0049513916697a2321