tree e97aa69d408b3bd2037761b03e79a7b95237446a
parent ceeab499ac86c16b2b8b53adc713b9796b79961c
parent 3ccb35421d642e96048d5cdeb60043634933267d
author Russell Brenner <russellbrenner@google.com> 1459528331 +0000
committer android-build-merger <android-build-merger@google.com> 1459528331 +0000

Merge "Add new protection level for setup wizard" into nyc-dev
am: 3ccb354

* commit '3ccb35421d642e96048d5cdeb60043634933267d':
  Add new protection level for setup wizard

Change-Id: Ib88a868f214d1502538f544b1b5d8c5a8551b78d