diff options
| author | Mike Lockwood <lockwood@google.com> | 2014-06-02 18:32:26 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-02 18:32:26 +0000 |
| commit | 9dc96cf0fc6261606495e5e56c0be7bee77d8895 (patch) | |
| tree | 8673e4ffebf02a196c1b61663f6afb66c710c2ab /media/jni | |
| parent | 307a37c2afc30190151285eb96ebd6a6940a96ec (diff) | |
| parent | a0183b02e4c6f53587519b445a546192b4a20146 (diff) | |
| download | frameworks_base-9dc96cf0fc6261606495e5e56c0be7bee77d8895.zip frameworks_base-9dc96cf0fc6261606495e5e56c0be7bee77d8895.tar.gz frameworks_base-9dc96cf0fc6261606495e5e56c0be7bee77d8895.tar.bz2 | |
am a0183b02: am 8868d129: am 1c725866: Merge "MtpDatabase JNI: Fixed incorrect method name in ALOGE."
* commit 'a0183b02e4c6f53587519b445a546192b4a20146':
MtpDatabase JNI: Fixed incorrect method name in ALOGE.
Diffstat (limited to 'media/jni')
| -rw-r--r-- | media/jni/android_mtp_MtpDatabase.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/jni/android_mtp_MtpDatabase.cpp b/media/jni/android_mtp_MtpDatabase.cpp index 15974e5..19b54a6 100644 --- a/media/jni/android_mtp_MtpDatabase.cpp +++ b/media/jni/android_mtp_MtpDatabase.cpp @@ -513,7 +513,7 @@ MtpResponseCode MyMtpDatabase::setObjectPropertyValue(MtpObjectHandle handle, break; } default: - ALOGE("unsupported type in getObjectPropertyValue\n"); + ALOGE("unsupported type in setObjectPropertyValue\n"); return MTP_RESPONSE_INVALID_OBJECT_PROP_FORMAT; } |