refs/heads/n-iot-preview-4 - platform/system/security

commit: a3097ff9327ce7ac2cad3d5250d90170676c44b9
[log]
author: Janis Danisevskis <[email protected]>
Wed Jan 04 16:50:03 2017 +0000
committer: android-build-merger <[email protected]>
Wed Jan 04 16:50:03 2017 +0000
tree: bf4edc9d5807a25d3980f0f20d6857cd4ffab15f
parent: eafb8d9b3f7406b70c292902eca645dc00cea07a [diff]
parent: 46239714428b19c4d8a42ef866bbef4440478f1d [diff]

Merge "fix is_secret_key_operation check" am: 7f35beb6cb am: 216b33f09c
am: 4623971442

Change-Id: I0f2320b758bcfe6bb2e5ab1dffab185100b89cc0

tree: bf4edc9d5807a25d3980f0f20d6857cd4ffab15f