tree bd9b0895bcba7fb4628beb7bf53d5b38ac63dd8e
parent 9cbd06d349675739f343f7866bdcadd56880ed0e
parent 73d27984f61bf3bf822988b824cc6f0cce2a081b
author Victor Hsieh <victorhsieh@google.com> 1567643777 -0700
committer android-build-merger <android-build-merger@google.com> 1567643777 -0700

Merge "Make keystore a core service" am: 04b8903804 am: 5f58b20b00
am: 73d27984f6

Change-Id: I244b83dee81280c2fc418893ef4a04ff52586e59