am eeb4e1e1: am 96cf1b1e: Merge "Include operation handle in OperationResult"

* commit 'eeb4e1e154daeaa1e733bb4f45e17da9266c7711':
  Include operation handle in OperationResult
tree: 684055f40cfa9d869b0ff07b6ee3255cb42ca730
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/