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
This commit is contained in:
Clara Bayarri
2016-04-29 17:43:42 +00:00
committed by android-build-merger

Diff Content Not Available