| commit | 40c928571b9ceb1eba04e8bd01de223d6e491618 | [log] [tgz] |
|---|---|---|
| author | Ji Wang <wangji.wang@huawei.com> | Fri Oct 21 15:14:17 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Oct 21 15:14:17 2016 +0000 |
| tree | 31b6bdddee95c3f54311cdf19edc0c25b24584e0 | |
| parent | 4caa5c0f984e0716b7cfb29526b18fde8e40b595 [diff] | |
| parent | 0e1b1533db77f1e34bb1ba2466346199249a5fe2 [diff] |
Merge "keystore: add upgradeKeyBlob call into keystore exportKey." am: 2354534060 am: cb9842abce am: 0e1b1533db Change-Id: I3f0b7d18929bda2ce4dfe668983309d0b0e13334