summaryrefslogtreecommitdiff
path: root/opengl/java/android
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2017-02-03 00:58:38 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-02-03 00:58:38 +0000
commit65b0a6f5965d570cd66e4d70a5824fadc5ddb45a (patch)
tree3d82a5c37f20684a796e0128e6dab1093f7089ef /opengl/java/android
parentbafa3c1d3b436fdaa31dabaeb49bc0d9b125c887 (diff)
parentbf16fab4e7e2829f219ed671616f062220531b47 (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 Change-Id: Ie048d01183ce63035cfa63ab54414b40f0b2b2c7
Diffstat (limited to 'opengl/java/android')
0 files changed, 0 insertions, 0 deletions