Merge "Fix a mismatched malloc/delete"
am: 619ac6c26b

Change-Id: Ica395908bc37d856446ba0baa60b6d1bc7993796
tree: 7364595fb063a76429a4cf3c96053f86202c3b7c
  1. Android.mk
  2. keymaster_qcom.cpp
  3. keymaster_qcom.h
  4. QSEEComAPI.h