am 6032dcf9: (-s ours) am a79431b4: am d8ba6abf: Merge "[DO NOT MERGE] Fix a bug where autoshift would be ignored coming from emoji" into klp-dev

Browse Source

* commit '6032dcf9505f8c72abda465c7cc72cfa2a011372':
  [DO NOT MERGE] Fix a bug where autoshift would be ignored coming from emoji

...

This commit is contained in:

Ken Wakasa 2013-10-17 09:43:24 -07:00 committed by Android Git Automerger

parent e328f6d0d8 6032dcf950

commit a5628933ff

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available