OSDN Git Service

Merge "Remove Secure Startup option from Security Settings" into nyc-dev am: 35bf932e...
authorClara Bayarri <clarabayarri@google.com>
Fri, 29 Apr 2016 17:43:41 +0000 (17:43 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 29 Apr 2016 17:43:41 +0000 (17:43 +0000)
commitc970be3876e0623d83054a9cea33dc729563bf1c
tree77fd9bd770f604cb22d0936333869af111c1ecd1
parent79a6c4ada34b469c3813146ecc3379ef9d3d0fea
parent2e8d2fabfcb815a2199195dd1a7669b59338fdf4
Merge "Remove Secure Startup option from Security Settings" into nyc-dev am: 35bf932eb0 am: 1159a0a79c
am: 2e8d2fabfc

* commit '2e8d2fabfcb815a2199195dd1a7669b59338fdf4':
  Remove Secure Startup option from Security Settings

Change-Id: I32d3c509f0b7ba03acc8f933d2840bb92c293872