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:42 +0000 (17:43 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 29 Apr 2016 17:43:42 +0000 (17:43 +0000)
commitc1367a7c2dffb03df65248f5b557d0d6ffd26bd9
tree77fd9bd770f604cb22d0936333869af111c1ecd1
parentc970be3876e0623d83054a9cea33dc729563bf1c
parent663353e71b52f0e3b8e53043a4ae2a07b0e38df5
Merge "Merge "Remove Secure Startup option from Security Settings" into nyc-dev am: 35bf932eb0 am: 99e5285425" into nyc-mr1-dev-plus-aosp
am: 663353e71b

* commit '663353e71b52f0e3b8e53043a4ae2a07b0e38df5':

Change-Id: I80757e298cce057ca12584e19b49c5b4a9bcf8b7