commit f7bdc8fd8753e6b572daa589efe414ac36cd43cc
author Atanas Kirilov <akirilov@google.com> Fri Jun 01 00:19:17 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 01 00:19:17 2018 +0000
tree da8831f013f0ff1b01e1e8fb1d76fe7b40f74aea
parent 7459ff44a00711eef114f0d14de8fc720583f63a
parent 870a173e43c7ad9e4c1d07a9931718ddee533f50

Merge changes from topic "am-d8363787-88bb-4e45-b57c-b18d9d8290cb" into oc-dev

* changes:
  [automerger] Messaging ignores file URIs shared via intent am: 9deefdf182 am: ea03db3303 am: cd77076596 am: 9c69271a58 am: 0c21193863
  [automerger] Messaging ignores file URIs shared via intent am: 9deefdf182 am: ea03db3303 am: cd77076596 am: 9c69271a58
  [automerger] Messaging ignores file URIs shared via intent am: 9deefdf182 am: ea03db3303 am: cd77076596
  [automerger] Messaging ignores file URIs shared via intent am: 9deefdf182 am: ea03db3303
  [automerger] Messaging ignores file URIs shared via intent am: 9deefdf182
  Messaging ignores file URIs shared via intent