Merge "hardware/qcom/keymaster: use proper nativehelper headers" am: 3587a1a811
am: 8edff26b02

Change-Id: I8a02d1f9f2429f684cec1f5a94195514891acf85
tree: a48381ca4870fb636c5de4bbb15a27438bb85c1f
  1. Android.mk
  2. keymaster_qcom.cpp
  3. keymaster_qcom.h
  4. QSEEComAPI.h