tree 91b764109a7320e38d4515bf76dcd24cd34344e6
parent 0d9e379cd682844ab3ae2b10c1b715bd164aa2fd
parent 3e4e6b3d68cf72e98465bd41e59e5c50fbe4a049
author Tianjie Xu <xunchang@google.com> 1539377215 -0700
committer android-build-merger <android-build-merger@google.com> 1539377215 -0700

Merge "Add function to load the key from x509.pem file" am: ff89e0004f
am: 3e4e6b3d68

Change-Id: I561b492224b311a09054329697e60111be35308b