Merge commit '7d563651aa956c0f9831b7b64be35c2ec790bdec' into HEAD
tree: 968bc96593217c67fc6b9ebad42058a024484edb
  1. Android.mk
  2. keymaster_qcom.cpp
  3. keymaster_qcom.h
  4. QSEEComAPI.h