tree e31973847d6b3b7622b8f490b49c202dbcbb7cdb
parent 8abe600b81c5ec54eaf5e93bf3226595359e8a25
parent 9fff241a5d5b61f7f5f250672449666cf30231ed
author Bryan Ferris <bferris@google.com> 1562801993 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1562801993 +0000

Merge changes from topic "am-491d8213-3eca-4563-937d-c6f23dd5f887" into oc-dev

* changes:
  [automerger] Fix Layout.primaryIsTrailingPreviousAllLineOffsets am: d3e81cd63f
  Fix Layout.primaryIsTrailingPreviousAllLineOffsets