OSDN Git Service

Merge "Remove Secure Startup option from Security Settings" into nyc-dev am: 35bf932eb0
authorClara Bayarri <clarabayarri@google.com>
Fri, 29 Apr 2016 17:41:14 +0000 (17:41 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 29 Apr 2016 17:41:14 +0000 (17:41 +0000)
commit2e8d2fabfcb815a2199195dd1a7669b59338fdf4
treeb5c6782c9b02a2164941f9ab6e306980c0f60f3e
parenta4a7cb0515319822fd1953cd1e06e677b71ec4d6
parent1159a0a79cdf9fcbbae574198ae5ba192ef84aca
Merge "Remove Secure Startup option from Security Settings" into nyc-dev am: 35bf932eb0
am: 1159a0a79c

* commit '1159a0a79cdf9fcbbae574198ae5ba192ef84aca':
  Remove Secure Startup option from Security Settings

Change-Id: I2721e0e9e2d5920e54b549124664a303a591ae54