tree 52468258fbdeec46c7e819f9a5866a89af2ddf6c
parent 3cb433ee7db0b2534bd0ae64c338f650730bb559
parent 2e6c77a14dfa58d06fa30234544881e428891d62
author Karsten Tausche <karsten@fairphone.com> 1534323413 +0200
committer Karsten Tausche <karsten@fairphone.com> 1534323413 +0200

Merge the 2018-09-05 SPL branch from AOSP-Partner

* security-aosp-nyc-mr2-release:
  Messaging ignores file URIs shared via intent

Change-Id: I266c3acd1e732e15ca48c3a203b116439581d52a