| commit | 00af0a6d2c513a6676e97628fd40c83156f68066 | [log] [tgz] |
|---|---|---|
| author | Jeff Sharkey <jsharkey@google.com> | Fri Feb 03 00:35:19 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Feb 03 00:35:19 2017 +0000 |
| tree | c415213d66999f55080104facd973beeb8dde6ac | |
| parent | c0cc8695a5fdec51938dc49e134df2f0ca0cfe79 [diff] | |
| parent | 4b0164b27cc9e891f7a4b6d2b2c624600ac697bc [diff] |
Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-dev am: 3e4faac39f -s ours am: b058dc139d am: d20b04a41d -s ours am: 4b0164b27c Change-Id: I4dda89507d1003f82af6e204c9983732b36927da