tree a23633eef37704a41b1f18d2ca1d9f35d710cd42
parent 9fe270641d72ad7aa02769fdc80e04bb9fed7c3a
parent 96b00c572e62f38aacb99f72f7dd882ed9fd6b70
author Colin Cross <ccross@android.com> 1508908051 +0000
committer android-build-merger <android-build-merger@google.com> 1508908051 +0000

Merge "Move keystore to Android.bp."
am: 96b00c572e

Change-Id: I5a82d97d5c94f0cc5f6535bf20df8db77e54238a