OSDN Git Service

Merge "Merge "Remove Secure Startup option from Security Settings" into nyc-dev am...
authorClara Bayarri <clarabayarri@google.com>
Fri, 29 Apr 2016 17:43:43 +0000 (17:43 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 29 Apr 2016 17:43:43 +0000 (17:43 +0000)
am: 23456e3844

* commit '23456e3844e2b54c5003b777b34ed5d8806eea1b':

Change-Id: Ida6baacccfdcc11b5a9316ca8b7a20526bd88c60


Trivial merge