tree c0c70a71215e146cccbf41693b10c4be4fa7b58b
parent 36eb7a13709073111e2397c9f542cb6f64f3f2b9
parent f97faada5d34765600b0a5d1274e1c68f7d79ba9
author Benjamin Franz <bfranz@google.com> 1469177257 +0000
committer android-build-merger <android-build-merger@google.com> 1469177257 +0000

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

Change-Id: I8f2fad8933d62c0424632c7fcd5e158aa1b0d4bf