commit | 76970ce2bcedcd5c0eb26ea78c696c2b677c711d | [log] [tgz] |
---|---|---|
author | Android Build Merger (Role) <android-build-merger@google.com> | Fri Feb 03 01:37:00 2017 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Feb 03 01:37:04 2017 +0000 |
tree | 70c36e82763ceed6d3ee0482e40f8c7dfcc47434 | |
parent | 6328cc234a90288f1dc4bfa2c8dc17bba2f3b8f1 [diff] | |
parent | f122300f2d3928e0693823ef56bec2e896558cc1 [diff] |
Merge "DO NOT MERGE. No direct Uri grants from system. am: 2dfdf662d0 -s ours am: 4a4b6bfafb am: 61e9179646 -s ours am: 9346bec730 am: c0cc8695a5 am: f51e8e8642 am: bf16fab4e7 -s ours am: 65b0a6f596 am: 6f47221263 am: 47bfa0ab25 am: 6cfa84791d am: 87ae27b020" into nyc-mr2-dev-plus-aosp