diff options
| author | Dianne Hackborn <hackbod@google.com> | 2011-06-10 12:45:36 -0700 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2011-06-10 12:45:36 -0700 |
| commit | 6b592723c9a9fc816a8ab75c935e8cd20ff65a0e (patch) | |
| tree | 00b93945a1c8051172316575208f14c355e663c3 /include | |
| parent | 08b992c88e60a95b629a70cd197b3d3b9b27fb8d (diff) | |
| parent | f51ded0f8f593d17af82946eb65c05fc04f688b4 (diff) | |
| download | frameworks_base-6b592723c9a9fc816a8ab75c935e8cd20ff65a0e.zip frameworks_base-6b592723c9a9fc816a8ab75c935e8cd20ff65a0e.tar.gz frameworks_base-6b592723c9a9fc816a8ab75c935e8cd20ff65a0e.tar.bz2 | |
resolved conflicts for merge of f51ded0f to master
Change-Id: Ida356524a68aeb2b9b0013dfbb6ab4bd11e616e2
Diffstat (limited to 'include')
| -rw-r--r-- | include/utils/ResourceTypes.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/utils/ResourceTypes.h b/include/utils/ResourceTypes.h index 8a92cd6..612ff93 100644 --- a/include/utils/ResourceTypes.h +++ b/include/utils/ResourceTypes.h @@ -1988,7 +1988,8 @@ public: String16* outName, const String16* defType = NULL, const String16* defPackage = NULL, - const char** outErrorMsg = NULL); + const char** outErrorMsg = NULL, + bool* outPublicOnly = NULL); static bool stringToInt(const char16_t* s, size_t len, Res_value* outValue); static bool stringToFloat(const char16_t* s, size_t len, Res_value* outValue); |