Merge changes from topic "am-0f30ee3d-94a0-4dc3-bb14-762781265ad9" into oc-dev

Browse Source

* changes:
  [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec2 skipped: 723f13d01f am: 04c7154fd9 am: 65082f8f5b am: 74ffd2bc55 am: f7f008f573 am: 7693ce7eaf am: 11ba74cce9
  [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec2 skipped: 723f13d01f am: 04c7154fd9 am: 65082f8f5b am: 74ffd2bc55 am: f7f008f573 am: 7693ce7eaf
  [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec2 skipped: 723f13d01f am: 04c7154fd9 am: 65082f8f5b am: 74ffd2bc55 am: f7f008f573
  [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec2 skipped: 723f13d01f am: 04c7154fd9 am: 65082f8f5b am: 74ffd2bc55
  [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec2 skipped: 723f13d01f am: 04c7154fd9 am: 65082f8f5b
  [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec2 skipped: 723f13d01f am: 04c7154fd9
  [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec2 skipped: 723f13d01f
  [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec2
  [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea
  Fix crash during cursor moving on BiDi text

...

This commit is contained in:

Mihai Popa

2018-08-15 19:23:35 +00:00

committed by Android (Google) Code Review

parent d5e6e1e83e 01ff91a07c

commit fc28b6b724

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

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

Diff Content Not Available