tree 105a31217b40aa9a91d0e04727b8b0e4f93cada8
parent 2499a69dfdb2a85ac82554f3e73d731fd8c656b3
parent 85e15db31987daa6ca36f3f34f13944836822f1b
author Janis Danisevskis <jdanis@google.com> 1493914599 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1493914605 +0000

Merge "libkeymaster1 was split into libkeymaster and _portable"