tree 91b764109a7320e38d4515bf76dcd24cd34344e6
parent 28f34187b167557db7e94d38390789257906d648
parent 403356117f0eb5153b95c87ba55cf535164820df
author Tianjie Xu <xunchang@google.com> 1539377520 -0700
committer android-build-merger <android-build-merger@google.com> 1539377520 -0700

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

Change-Id: I74d691139565289136b49c72f143726a1d4180ba