tree cbdeff595a2fa616db60afe4ebff00ff0c0e50a6
parent aa7d7f122a2cc62c82ddd4bffb816887799c2af9
parent ac9d4ae1bfcf7f4917f8d9d0b1146d89e3f99e28
author Tianjie Xu <xunchang@google.com> 1540489228 -0700
committer android-build-merger <android-build-merger@google.com> 1540489228 -0700

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

Change-Id: I20cf75d7b357466650d0fce4efeb91f0fe2176e8