commit | 1eb2ded281e7a95a25f236f1087ca4ed51969500 | [log] [tgz] |
---|---|---|
author | Jeff Sharkey <jsharkey@google.com> | Fri Feb 03 00:59:15 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Feb 03 00:59:15 2017 +0000 |
tree | a0cbbd8572e2db353cd29f719ea826a43b8ec9e3 | |
parent | e6f2767d54863cbf1947c3e5025dd4021cd8e256 [diff] | |
parent | e6060558b36bae8f8863dfb89c404d35bf9f2e67 [diff] |
Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dev am: e6be8d765f am: 8f4f4daf2c am: 7c0ea478a8 am: 2848738526 -s ours am: f19cea14cf am: ee958351b7 am: e6060558b3 Change-Id: I3c1874a0178425fe0d23659af68d924ade910c65