OSDN Git Service

Merge "Don't default to PIN on non FBE devices. DO NOT MERGE" into oc-mr1-dev
authorMaurice Lam <yukl@google.com>
Fri, 8 Sep 2017 19:56:09 +0000 (19:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 8 Sep 2017 19:56:09 +0000 (19:56 +0000)
commitf26fe2763afa95c18172f262c6fcc504841ea14d
tree2ace78f3e5cf4c5875ac332db03dd301be283067
parente1f4703dbe18994bb00454ce3b1ad929c93e72a6
parent40e284b1962f8776006bc05f854659147fa02f2a
Merge "Don't default to PIN on non FBE devices. DO NOT MERGE" into oc-mr1-dev
am: 40e284b196

Change-Id: Ica634ce9776b0b0c30bfb49223a4d1d5fc5398ad