commit 00f3d8094733de407c9cd2669bf579a4d7740328
author Ken Wakasa <kwakasa@google.com> Tue Oct 09 07:50:48 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Oct 09 07:50:48 2012 -0700
tree 730d9bb301ae0413c49648a89698cd4033418c11
parent 0081681e346ce5c958e5eef264caa3f257b094c5
parent a62a192680c54c6c9152a5ebd448237c0fde171a

am a62a1926: am 471252b9: Merge "Fix a bug in multiple shortcut handling code." into jb-mr1-dev

* commit 'a62a192680c54c6c9152a5ebd448237c0fde171a':
  Fix a bug in multiple shortcut handling code.

native/jni/src/terminal_attributes.h

diff --git a/native/jni/src/terminal_attributes.h b/native/jni/src/terminal_attributes.h
index 53ae385..e72e7e3 100644
--- a/native/jni/src/terminal_attributes.h
+++ b/native/jni/src/terminal_attributes.h
@@ -57,7 +57,6 @@
                 outWord[i] = (uint16_t)codePoint;
             }
             *outFreq = BinaryFormat::getAttributeFrequencyFromFlags(shortcutFlags);
-            mPos += BinaryFormat::CHARACTER_ARRAY_TERMINATOR_SIZE;
             return i;
         }
     };