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:42:01 +0000 (17:42 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 29 Apr 2016 17:42:01 +0000 (17:42 +0000)
commite21fd581c026ddce022534d69379ab0518a8611c
treeb5c6782c9b02a2164941f9ab6e306980c0f60f3e
parent2e8d2fabfcb815a2199195dd1a7669b59338fdf4
parent99e5285425962f61d7b17dbb0f01471e3a8f2932
Merge "Remove Secure Startup option from Security Settings" into nyc-dev am: 35bf932eb0
am: 99e5285425

* commit '99e5285425962f61d7b17dbb0f01471e3a8f2932':

Change-Id: Id0f502c4093c7d48f4ec41c75e070c64df791298