| commit | 4c3ec15c18f9e15db830209fa754e6d48b8bbaf6 | [log] [tgz] |
|---|---|---|
| author | Adrian Roos <roosa@google.com> | Tue Aug 08 12:07:55 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Aug 08 12:07:55 2017 +0000 |
| tree | 5076593c0ba125942d76c6d51a157f7932257201 | |
| parent | 42d0c44a8fc84782d21e32e3bb69253cbba68d47 [diff] | |
| parent | eb83d9c0cc7933737950f96e187936e430d43079 [diff] |
Merge "FRP: Enable credential-based factory reset protection by default" into oc-mr1-dev am: 956491b867 am: eb83d9c0cc Change-Id: Ib8f23eb67e3af3626be3d075b512d3ad5e05ef3b