diff options
| author | Jeff Brown <jeffbrown@google.com> | 2010-07-16 10:06:33 -0700 |
|---|---|---|
| committer | Jeff Brown <jeffbrown@google.com> | 2010-07-16 10:06:33 -0700 |
| commit | eb857f12d605659b385d168ef1ea7d4ba5193585 (patch) | |
| tree | fda7ab277e7ef292f58175d8ce6a4e1251e69786 /include | |
| parent | c0eb6d6388ad4e7301a6813b4cf2edf6845bedba (diff) | |
| parent | f7adbe10c23ca86e70a6e3a8b1a90ebe23142d29 (diff) | |
| download | frameworks_base-eb857f12d605659b385d168ef1ea7d4ba5193585.zip frameworks_base-eb857f12d605659b385d168ef1ea7d4ba5193585.tar.gz frameworks_base-eb857f12d605659b385d168ef1ea7d4ba5193585.tar.bz2 | |
resolved conflicts for merge of f7adbe10 to master
Change-Id: I898a5e53b180adaee2337c0c0b9896c799d056e7
Diffstat (limited to 'include')
| -rw-r--r-- | include/utils/String8.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/utils/String8.h b/include/utils/String8.h index c4b18a4..0b18fe3 100644 --- a/include/utils/String8.h +++ b/include/utils/String8.h @@ -171,6 +171,8 @@ public: status_t append(const char* other); status_t append(const char* other, size_t numChars); + status_t appendFormat(const char* fmt, ...); + // Note that this function takes O(N) time to calculate the value. // No cache value is stored. size_t getUtf32Length() const; |