tree 3b067bcbf6469b563e45e6fde9e2ae6e3930f345
parent 8913a0632903ad36695286b4be123633026244e3
parent 358569004799130b61f89a639a772a934aad849b
author Mihai Popa <popam@google.com> 1534369087 -0700
committer android-build-merger <android-build-merger@google.com> 1534369087 -0700

[automerger skipped] Merge "Fix crash during cursor moving on BiDi text" into oc-dev am: e385255db4 am: 06829a62b1  -s ours
am: 3585690047  -s ours

Change-Id: I3990f8533376209673b25f714e154bd94147b91b