tree cbdeff595a2fa616db60afe4ebff00ff0c0e50a6
parent 858fe12f39435050ec5c50b5f715ffe8843b6541
parent 23b832fd1d32b1385358729d9f2eae5465f3ebef
author Tianjie Xu <xunchang@google.com> 1540489505 -0700
committer android-build-merger <android-build-merger@google.com> 1540489505 -0700

Merge "Remove the load_keys function" am: 64ceace44f am: ac9d4ae1bf
am: 23b832fd1d

Change-Id: Ie9c793059b6e6763dd9af014624222b3faaf0e5b