OSDN Git Service

Merge "Adds default keymaster service to the early_hal class" into oc-dev
authorJanis Danisevskis <jdanis@google.com>
Fri, 7 Apr 2017 06:11:44 +0000 (06:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 7 Apr 2017 06:11:44 +0000 (06:11 +0000)
am: 8080d70564

Change-Id: I45857b74581c2e7b4c321cc13b8ebc77546fb7a2


Trivial merge