summaryrefslogtreecommitdiffstats
path: root/cmds
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2014-04-24 15:43:24 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-04-24 15:43:24 +0000
commitf4567f0c50e88261dd897a9933b5d885c1406a45 (patch)
tree28c5f203a67d6c696b20ab471e5e911de91c8cbe /cmds
parente255d7399f46de4b4e3d94b95b26df3408274394 (diff)
parent56cc5ba79bdf75a73281dc73f13169a409d96c28 (diff)
downloadframeworks_base-f4567f0c50e88261dd897a9933b5d885c1406a45.zip
frameworks_base-f4567f0c50e88261dd897a9933b5d885c1406a45.tar.gz
frameworks_base-f4567f0c50e88261dd897a9933b5d885c1406a45.tar.bz2
am 56cc5ba7: am 8d47f23e: am dbb0de21: Merge "Fix a typo in an assertion."
* commit '56cc5ba79bdf75a73281dc73f13169a409d96c28': Fix a typo in an assertion.
Diffstat (limited to 'cmds')
-rw-r--r--cmds/app_process/app_main.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/cmds/app_process/app_main.cpp b/cmds/app_process/app_main.cpp
index 859d83b..3481437 100644
--- a/cmds/app_process/app_main.cpp
+++ b/cmds/app_process/app_main.cpp
@@ -219,7 +219,7 @@ int main(int argc, char* const argv[])
char prop[PROP_VALUE_MAX];
if (property_get(ABI_LIST_PROPERTY, prop, NULL) == 0) {
- LOG_ALWAYS_FATAL("app_process: Unable to deterimine ABI list from property %s.",
+ LOG_ALWAYS_FATAL("app_process: Unable to determine ABI list from property %s.",
ABI_LIST_PROPERTY);
return 11;
}