commit | 89c52f16ecea4ebf08d6b3c863e0848438bac23d | [log] [tgz] |
---|---|---|
author | Shawn Willden <swillden@google.com> | Wed Jan 27 23:41:33 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Jan 27 23:41:33 2016 +0000 |
tree | 12c40bedcb99c13280c76580438bc7552e042675 | |
parent | c1d1feee514e6138e1ed8ff924f5453ba8e1408a [diff] | |
parent | f647e0a99492d21825e891c53b9a05fed04dbb9c [diff] |
Merge "Update Keystore to use keymaster2 HAL." am: fd50293cd5 am: f647e0a994 * commit 'f647e0a99492d21825e891c53b9a05fed04dbb9c': Update Keystore to use keymaster2 HAL.