summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenny Root <kroot@android.com>2014-01-14 09:23:19 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2014-01-14 09:23:19 -0800
commit70d36107318e1d3f7abf62a56279b3f9da3ff000 (patch)
tree02a054f95b9d7a6b4007f2ec7fc2ec27bca55776
parent162723c02a5f79d64790d3f698a6edd72f969599 (diff)
parent711560b67b176efdcaa3dfe4e5d8fea13e60f01f (diff)
downloadandroid_hardware_qcom_keymaster-70d36107318e1d3f7abf62a56279b3f9da3ff000.tar.gz
android_hardware_qcom_keymaster-70d36107318e1d3f7abf62a56279b3f9da3ff000.tar.bz2
android_hardware_qcom_keymaster-70d36107318e1d3f7abf62a56279b3f9da3ff000.zip
am 711560b6: Merge "Log message spelling correction."
* commit '711560b67b176efdcaa3dfe4e5d8fea13e60f01f': Log message spelling correction.
-rw-r--r--keymaster_qcom.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/keymaster_qcom.cpp b/keymaster_qcom.cpp
index 2284290..dd29c95 100644
--- a/keymaster_qcom.cpp
+++ b/keymaster_qcom.cpp
@@ -759,7 +759,7 @@ static int qcom_km_open(const hw_module_t* module, const char* name,
ret = (*km_handle->QSEECom_start_app)((struct QSEECom_handle **)&km_handle->qseecom,
"/vendor/firmware/keymaster", "keymaster", 4096*2);
if (ret) {
- ALOGE("Loading keymaster app failied");
+ ALOGE("Loading keymaster app failed");
free(km_handle);
return -1;
}