| commit | e1f4703dbe18994bb00454ce3b1ad929c93e72a6 | [log] [tgz] |
|---|---|---|
| author | Andrew Scull <ascull@google.com> | Fri Sep 08 19:33:34 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Sep 08 19:33:34 2017 +0000 |
| tree | 9286cabbbff10279d79051974294def007ca5955 | |
| parent | d2f9de37c7797731e3daed12e30191f619f987d6 [diff] | |
| parent | 0bac26b6cd0498a541970571ba4a9cefbc88eb02 [diff] |
Merge "Policy transparency when DISALLOW_FACTORY_RESET prevents OEM unlock." into oc-mr1-dev am: 0bac26b6cd Change-Id: I30996559ac5166d4ed2cf59688239effe335a305