tree e3d5104a368a38bec6890f30b97898bee35b0f12
parent 6b96f314a39f7e7179259848d748ffd6ae05fe6b
parent f0a36952dceb805ceea2daef0e3545257573643b
author Tavis Bohne <tbohne@google.com> 1465405743 +0000
committer android-build-merger <android-build-merger@google.com> 1465405743 +0000

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

Change-Id: I674e2feb8e4d5378765c6ebec371d76cef7d769a