commit 3873d36128c2066387bf9db90857cba0f67cb8a0
author Ken Wakasa <kwakasa@google.com> Tue Oct 09 08:53:55 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Oct 09 08:53:55 2012 -0700
tree d37d56cbd49d3edfbf6bcc1c75bf4cbb9a059728
parent 06636bf96a86130a53f299a4ed3436415392f885
parent 00f3d8094733de407c9cd2669bf579a4d7740328

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

* commit '00f3d8094733de407c9cd2669bf579a4d7740328':
  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;
         }
     };