tree 59b7516acb7a583b5938d2ac91efaf64f8f4ca13
parent 758fbc0e76c1f2cb30c81b1cb0aa67a8e118185f
parent 7b69285f87a9833832ebc8ac78e68a6e435fdbb5
author TreeHugger Robot <treehugger-gerrit@google.com> 1591212672 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1591212672 +0000

Merge "Also call Intent#fixUris for the intent resolver case" into rvc-dev am: 31a2e1ba46 am: 7b69285f87

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11689597

Change-Id: Ic517938134290e42fa5533b9067653d8dc77743e