tree 3bd346ff6c390bbbedd8a0d60f2244c2a1c63f6f
parent b7d07f7b1e12b858cd88dc72900abf370def25cf
parent 60ea643afbe091ad837f51506d30794e095dc8f1
author Tao Bao <tbao@google.com> 1490038565 +0000
committer android-build-merger <android-build-merger@google.com> 1490038565 +0000

Merge "Add testcases for load_keys()." am: 110102f37e am: 43f5ad6e90
am: 60ea643afb

Change-Id: I2246094d0db184726cae34d7b916c127512ad6d2