OSDN Git Service

Merge "Remove Secure Startup option from Security Settings" into nyc-dev
authorClara Bayarri <clarabayarri@google.com>
Fri, 29 Apr 2016 17:38:56 +0000 (17:38 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 29 Apr 2016 17:38:56 +0000 (17:38 +0000)
commit1159a0a79cdf9fcbbae574198ae5ba192ef84aca
treef37270814a1e9d961bc8696dc3c0195b92fc08cb
parent0a84fd121d8bf2c1301f4d4eb6465212f1172094
parent35bf932eb0daf8038cc917508839784953c45c72
Merge "Remove Secure Startup option from Security Settings" into nyc-dev
am: 35bf932eb0

* commit '35bf932eb0daf8038cc917508839784953c45c72':
  Remove Secure Startup option from Security Settings

Change-Id: Id555f9a2abadf9a941e5e63e60ea55c5ce7179bd