diff options
| author | Jeff Sharkey <jsharkey@google.com> | 2017-02-03 01:07:09 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-02-03 01:07:09 +0000 |
| commit | cecf30c3a27fcc30df5c770194a80b2c4ce246ae (patch) | |
| tree | a246c27eda434542bd8c1c0f6023994441a739f9 /opengl/java/android | |
| parent | 6f4722126314f79ad8fa50aec46f27d796b2a6f9 (diff) | |
| parent | 43f79eec8be1af10013d906869af289aaca6520d (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
am: 43f79eec8b
Change-Id: I46242f1ea9d7a2e63267c1d3d77c6ab3c5957435
Diffstat (limited to 'opengl/java/android')
0 files changed, 0 insertions, 0 deletions