tree b2a88c374378f0f2508aa3492ea270fbe3b0c498
parent 4eea9764a445e460ab2491ca964a8c442158f476
parent 52f822d6ae6b0ff611b2912e0472ea4544f62ffc
author Janis Danisevskis <jdanis@google.com> 1564611590 -0700
committer android-build-merger <android-build-merger@google.com> 1564611590 -0700

Merge "Keystore should be developed in AOSP."
am: 52f822d6ae

Change-Id: I5c728903e615650946940d39f9bf3b2a7033b11d