tree e3d5104a368a38bec6890f30b97898bee35b0f12
parent 4e106215eda80700eb52c911111ec2e270c4114f
parent 9de3ed279b308ff6209db2f74539494d60e81271
author Tavis Bohne <tbohne@google.com> 1465405393 +0000
committer android-build-merger <android-build-merger@google.com> 1465405393 +0000

Merge \"Messenger refuses all file:///data/ uris\" into nyc-dev
am: 9de3ed279b

Change-Id: I767e29fcbf808a84354b15a511a65f0a4a8a04ae