tree 86a49708fe296ba8f6f9896aae408ee42b84ac56
parent 05afaeead603daec557e96927fb5e1722402a457
parent 2c038ce0de0a1dd12c875932972fbe200201296a
author Bryan Ferris <bferris@google.com> 1562796837 -0700
committer android-build-merger <android-build-merger@google.com> 1562796837 -0700

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

Change-Id: I9de3d654e367f8964b2f3b6f3c1d9ef931fa37c0