commit ecc48fbc9669702a9bce0b14ac57f6e885239a38
author Bryan Ferris <bferris@google.com> Wed Jul 10 21:11:06 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jul 10 21:11:06 2019 +0000
tree e31973847d6b3b7622b8f490b49c202dbcbb7cdb
parent 29534f6c57148c024aee59d82340eadf033c747a
parent ca15b13eb3468b879f57c2f47ff0a257f56ea212

Merge changes from topic "am-8d44d2e5-2b24-4867-a4fc-1c5b430ac3a0" into oc-dev

* changes:
  [automerger] Fix Layout.primaryIsTrailingPreviousAllLineOffsets am: 7d6c02de04 am: 5ad1deb51c am: 1310e43605 am: c3ab9f6ac7 am: 2f9dd0cc12
  [automerger] Fix Layout.primaryIsTrailingPreviousAllLineOffsets am: 7d6c02de04 am: 5ad1deb51c am: 1310e43605 am: c3ab9f6ac7
  [automerger] Fix Layout.primaryIsTrailingPreviousAllLineOffsets am: 7d6c02de04 am: 5ad1deb51c am: 1310e43605
  [automerger] Fix Layout.primaryIsTrailingPreviousAllLineOffsets am: 7d6c02de04 am: 5ad1deb51c
  [automerger] Fix Layout.primaryIsTrailingPreviousAllLineOffsets am: 7d6c02de04
  Fix Layout.primaryIsTrailingPreviousAllLineOffsets