refs/heads/android11-mainline-release - platform/hardware/qcom/keymaster

commit: ecfe142948adf4f82083d7333b6c778f3993842b
[log]
author: Xin Li <[email protected]>
Sun Feb 24 02:28:25 2019 -0800
committer: android-build-merger <[email protected]>
Sun Feb 24 02:28:25 2019 -0800
tree: c70089451e810f18fa390fb86dd5672f971c7a8e
parent: 351281cd1e691df7efb92363e4527e50a979c357 [diff]
parent: a0cac96b994a8a1710bd41fdff29d6efcbedd085 [diff]

[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
am: a0cac96b99 -s ours
am skip reason: subject contains skip directive

Change-Id: I7d1e3300f006935163118e46e561af15a5652b3a

tree: c70089451e810f18fa390fb86dd5672f971c7a8e

Android.mk
keymaster_qcom.cpp
keymaster_qcom.h
QSEEComAPI.h