tree cbdeff595a2fa616db60afe4ebff00ff0c0e50a6
parent accb42d1b3fb508c57264f284ee6b4c6216eb888
parent 64ceace44f7a76d6b459edf4bfe42818b6825b4b
author Tianjie Xu <xunchang@google.com> 1540488930 -0700
committer android-build-merger <android-build-merger@google.com> 1540488930 -0700

Merge "Remove the load_keys function"
am: 64ceace44f

Change-Id: I237dfde12e8597c36463ca31e487bf36b0d13ea1