tree 92959b392cf1612607778eff5dc56bbdf31f96ea
parent 69baf0d2a42ced4157679c3dc3266de9c9ad61af
parent 143c65d520b197a271d6de282fc7759d8009ce44
author Shawn Willden <swillden@google.com> 1530163009 -0700
committer android-build-merger <android-build-merger@google.com> 1530163009 -0700

Merge "Correct the keystore alias used for secure imports" into pi-dev
am: 143c65d520

Change-Id: I100df017d1a6ad28cea2c6d78b1b0c55230897b3