tree bdcd16c0a69733f7eb0e4c8a31ea4eabe491588f
parent 471e961567c52afc5a00370452e5f1b4f3cab8cd
parent 3f903ce42208f1f03b007c33ede1ee70e5856a7d
author Victor Hsieh <victorhsieh@google.com> 1570050523 -0700
committer android-build-merger <android-build-merger@google.com> 1570050523 -0700

Merge "New APIs for a keystore client to list and get keys" am: e7dc464319
am: 3f903ce422

Change-Id: I9b341880e8610795e1fffc477f89a2467a9ba01d