tree 579ccc7fc63c70d1c87002573d896300cdbe0ae8
parent e3bfbf1e35dd3589fcb7b24d4d05da3327230cba
parent b565b782283c804595e0df3dd10c59c961e98c65
author Bryan Ferris <bferris@google.com> 1562798288 -0700
committer android-build-merger <android-build-merger@google.com> 1562798288 -0700

Merge "Fix Layout.primaryIsTrailingPreviousAllLineOffsets" into pi-dev am: a94d8aed24 am: 2c8f7e6ae8 am: cf678239c8
am: b565b78228

Change-Id: I9c7e7c800ba80aee03323d35ff83aa490f0aacd6