commit a62a192680c54c6c9152a5ebd448237c0fde171a
author Ken Wakasa <kwakasa@google.com> Tue Oct 09 07:49:17 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Oct 09 07:49:17 2012 -0700
tree 730d9bb301ae0413c49648a89698cd4033418c11
parent c44314b40464366814179c5a5952a66ef65d9831
parent 471252b9da20f4b1d7f55fd15a34d3642a564fcb

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

* commit '471252b9da20f4b1d7f55fd15a34d3642a564fcb':
  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;
         }
     };