| commit | dec6e5ae4cb1bcd742211e3d89e5a2b774cd68c2 | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Fri Feb 03 01:38:38 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Feb 03 01:38:40 2017 +0000 |
| tree | 70c36e82763ceed6d3ee0482e40f8c7dfcc47434 | |
| parent | a41406165829843b623175f15a5b1df5bb1e4796 [diff] | |
| parent | 3a29ee31223c1904ef55521b02555d03c12de110 [diff] |
Merge "DO NOT MERGE. No direct Uri grants from system. am: 021747a076 -s ours am: 4d90982846 am: 9f70b6d4c5 am: 1007b773b9 am: 8501b686f7 am: 030e74a380" into nyc-mr2-dev-plus-aosp