Android CTS 5.1 release 4
am 2d8aa1e3: merge in master-release history after reset to f4191b59196237680f3ebc8fc2af62b36d9c25f9

* commit '2d8aa1e31fda7fd88c1b2d99c976832dd5374490':
  Set correct module version for qcom keystore
tree: a60c81346b17254696b29a4fb620e939ab728e6e
  1. Android.mk
  2. keymaster_qcom.cpp
  3. keymaster_qcom.h
  4. QSEEComAPI.h