tree 0ad93d87a2e709e9dfd9dc121bebfe377977ee97
parent 428b3bdca87a1483dfe5fedc548a6365f3b2e328
parent e84d37f1ee73f60536ae31afbaa5912918785be1
author Benjamin Franz <bfranz@google.com> 1469177664 +0000
committer android-build-merger <android-build-merger@google.com> 1469177664 +0000

Merge \\"Block user from setting safe boot setting via adb\\" into nyc-dev am: f97faada5d
am: e84d37f1ee

Change-Id: Iecce325f92455edfac8065a843dacf2f938bb560