diff options
| author | Elliott Hughes <enh@google.com> | 2015-02-04 20:14:50 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-04 20:14:50 +0000 |
| commit | e91c3dd028c6cf551e905c5d2cfb5d1fc0c8bcb7 (patch) | |
| tree | 9e7913af62ee68d339a399723f83c4ef05b79d32 /include | |
| parent | 7bc903581f879c86f3881a2f7563bd28c1ac29b7 (diff) | |
| parent | 6a025acb630a3ac4a84715d188aeb48f1946bc3f (diff) | |
| download | frameworks_av-e91c3dd028c6cf551e905c5d2cfb5d1fc0c8bcb7.zip frameworks_av-e91c3dd028c6cf551e905c5d2cfb5d1fc0c8bcb7.tar.gz frameworks_av-e91c3dd028c6cf551e905c5d2cfb5d1fc0c8bcb7.tar.bz2 | |
am 6a025acb: am ec0472ba: Merge "Move AString\'s StringPrintf out of the way."
* commit '6a025acb630a3ac4a84715d188aeb48f1946bc3f':
Move AString's StringPrintf out of the way.
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/foundation/AString.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/media/stagefright/foundation/AString.h b/include/media/stagefright/foundation/AString.h index c3a68e1..822dbb3 100644 --- a/include/media/stagefright/foundation/AString.h +++ b/include/media/stagefright/foundation/AString.h @@ -102,7 +102,7 @@ private: void makeMutable(); }; -AString StringPrintf(const char *format, ...); +AString AStringPrintf(const char *format, ...); } // namespace android |