summaryrefslogtreecommitdiffstats
path: root/tools/aapt
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-06-02 09:56:45 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-06-02 09:56:45 -0700
commit3df4e1a2f1b4f0eb110c8983107b7c7fa21ed338 (patch)
tree1d687db32a08d214e7522eae3d9850c7fcb59036 /tools/aapt
parentae545bb87c8509c31a72bbc03c0bee7cb23a5133 (diff)
parent0748a5698776d1a9693a5449ffc983af26cc533b (diff)
downloadframeworks_base-3df4e1a2f1b4f0eb110c8983107b7c7fa21ed338.zip
frameworks_base-3df4e1a2f1b4f0eb110c8983107b7c7fa21ed338.tar.gz
frameworks_base-3df4e1a2f1b4f0eb110c8983107b7c7fa21ed338.tar.bz2
am 0748a569: Merge "aapt: Remove terminal pointer incrementaion"
* commit '0748a5698776d1a9693a5449ffc983af26cc533b': aapt: Remove terminal pointer incrementaion
Diffstat (limited to 'tools/aapt')
-rw-r--r--tools/aapt/ResourceTable.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/tools/aapt/ResourceTable.cpp b/tools/aapt/ResourceTable.cpp
index 770b027..d051c29 100644
--- a/tools/aapt/ResourceTable.cpp
+++ b/tools/aapt/ResourceTable.cpp
@@ -2253,7 +2253,6 @@ bool ResourceTable::getAttributeFlags(
bool failed = false;
while (pos < end && !failed) {
const char16_t* start = pos;
- end++;
while (pos < end && *pos != '|') {
pos++;
}