OSDN Git Service

Merge \\"Block user from setting safe boot setting via adb\\" into nyc-dev am: f97faada5d
authorBenjamin Franz <bfranz@google.com>
Fri, 22 Jul 2016 08:54:35 +0000 (08:54 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 22 Jul 2016 08:54:35 +0000 (08:54 +0000)
am: 6b69f6597e

Change-Id: I2e3d13a01d8d2443c522a6b611b8c1068aebd5f6


Trivial merge