Merge "Merge "DO NOT MERGE. No direct Uri grants from system." into nyc-dev am: 0354b89d31 am: 5536402f6d am: 6db504c6f6 am: 609145c315 am: af86efd70d" into nyc-mr2-dev-plus-aosp

Browse Source

am: 651c9cd390  -s ours

Change-Id: Ica80e2af4f50e9e629654723021741bea53be930

...

This commit is contained in:

Jeff Sharkey

2017-02-03 01:59:51 +00:00

committed by android-build-merger

parent a3f0337ca5 651c9cd390

commit a6d7668119

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available