summaryrefslogtreecommitdiff
path: root/opengl/java/android
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2017-02-03 01:14:17 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-02-03 01:14:17 +0000
commit47bfa0ab2569eca72b1026cdbea0d221591ed661 (patch)
treefec2c72a0de19d85271d531b0db5194861c499c1 /opengl/java/android
parent770eff87cd60110e95971c13ccb25c0be2e3a630 (diff)
parent6f4722126314f79ad8fa50aec46f27d796b2a6f9 (diff)
DO NOT MERGE. No direct Uri grants from system. am: 2dfdf662d0 -s ours am: 4a4b6bfafb am: 61e9179646 -s ours am: 9346bec730 am: c0cc8695a5 am: f51e8e8642 am: bf16fab4e7 -s ours am: 65b0a6f596
am: 6f47221263 Change-Id: I8736bfebc8038f24628387444bc656c103fcdf36
Diffstat (limited to 'opengl/java/android')
0 files changed, 0 insertions, 0 deletions