tree 838493b302a23d771f0f41f01c09c798a1098e40
parent 825b3056378917b273a79e4b085f3fb9f433b44c
parent 59bfe5d653404457f03ef8e50bce007693f5ad28
author Seigo Nonaka <nona@google.com> 1570038271 -0700
committer android-build-merger <android-build-merger@google.com> 1570038271 -0700

[automerger skipped] RESTRICT AUTOMERGE Do not compute outside given range in TextLine am: 4ce901e405 am: b51c7bb175 am: af62f3a7b3 -s ours am: 86ddd9eb6a -s ours am: eab868fa63
am: 59bfe5d653

Change-Id: I4974f4242f138b989bf097b39303e5d4db9df2fd