tree ca96b410323aa44f652eddb70fc19c377ea10e6b
parent 0b9a63f96f22107d3cd5ce836aebec6fbab852cd
parent 23545340601012981ee4d0f8b99acc7da259ccc1
author Ji Wang <wangji.wang@huawei.com> 1477061770 +0000
committer android-build-merger <android-build-merger@google.com> 1477061770 +0000

Merge "keystore: add upgradeKeyBlob call into keystore exportKey."
am: 2354534060

Change-Id: I7b9514d93252c8c54005632479690e0a9ac0705f