summaryrefslogtreecommitdiff
path: root/opengl/java/android/opengl/Material.java
diff options
context:
space:
mode:
authorNikita Ioffe <ioffe@google.com>2020-05-08 17:31:38 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-05-08 17:31:38 +0000
commit5a1a2ede1f7fdf0192af0418a2c9cc9aeaa4a6d4 (patch)
treefaafffeadf9480db13ee04399e38b78d2ca6a6c3 /opengl/java/android/opengl/Material.java
parent20922e9d39b4b8991ec41db01e3f21a2849d8d1f (diff)
parenta23a9dc83b32ea5cc95fe690fc0453f7b7ed3ea3 (diff)
Merge "PackageParser2: collect certificates if requested" into rvc-dev am: a23a9dc83b
Change-Id: I546feff3c5d8b4878b286b6f316e6a2d74106eee
Diffstat (limited to 'opengl/java/android/opengl/Material.java')
0 files changed, 0 insertions, 0 deletions