Merge "DO NOT MERGE. No direct Uri grants from system. am: 6f13f73b73 am: 73f95823f8 -s ours am: 05749525a5 am: bd2bec9164 am: 1ddaf2f96b am: 56131cf7c0 -s ours am: cdb996355e am: d2a9d6fa27 am: 8d9953964a am: 8c23d1aadb am: b93bc585f0" into nyc-mr2-dev-plus-aosp

Browse Source

am: f6fa670588  -s ours

Change-Id: Idae546a67614dff9ecaf59443ad5dc8c61cdd03f

...

This commit is contained in:

Jeff Sharkey

2017-02-03 01:45:55 +00:00

committed by android-build-merger

parent b20f9a80d6 f6fa670588

commit a19958d052

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