diff options
| author | Jeff Sharkey <jsharkey@google.com> | 2017-02-03 00:59:32 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-02-03 00:59:32 +0000 |
| commit | 43f79eec8be1af10013d906869af289aaca6520d (patch) | |
| tree | 3d82a5c37f20684a796e0128e6dab1093f7089ef /opengl/java/android | |
| parent | 65b0a6f5965d570cd66e4d70a5824fadc5ddb45a (diff) | |
| parent | 4d1c25ec432fe873c33719fd20112459ecf00229 (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 am: 00af0a6d2c am: b4c5c522e3
am: 4d1c25ec43 -s ours
Change-Id: I3a65198bb51f19e7b655d1da0a081fafbae066fd
Diffstat (limited to 'opengl/java/android')
0 files changed, 0 insertions, 0 deletions