tree 877a7ff86fdd0475a03dc56344d51d9e4f41bdcc
parent d63d62117420a998cc6f3b30345120033c249c2a
parent aac806ae5ba55fce2d9ba58dad21865e25aa142d
author Janis Danisevskis <jdanis@google.com> 1564706789 -0700
committer android-build-merger <android-build-merger@google.com> 1564706789 -0700

Merge "Keymaster should be developed on AOSP"
am: aac806ae5b

Change-Id: I4c5b72d7c22ef7e4148c657f3e1c71e651728a3f