| commit | 67d24dce728ac6c533d2a4931b1fca995537eb65 | [log] [tgz] |
|---|---|---|
| author | Andrew Scull <ascull@google.com> | Fri Sep 08 19:51:09 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Sep 08 19:51:09 2017 +0000 |
| tree | f064f5aaaef080ebcc4bf15cadd47442368a6e3d | |
| parent | fbc7a00a5c1c29d6626abdd4e309b48268d0d86e [diff] | |
| parent | e1f4703dbe18994bb00454ce3b1ad929c93e72a6 [diff] |
Merge "Policy transparency when DISALLOW_FACTORY_RESET prevents OEM unlock." into oc-mr1-dev am: 0bac26b6cd am: e1f4703dbe Change-Id: I965bfe2e5a3be1c078c4769d2aaaa07fd92d1b1e