summaryrefslogtreecommitdiff
path: root/opengl/java/android/opengl/Material.java
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2020-05-27 19:21:20 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-05-27 19:21:20 +0000
commit8e58a2dcdae1ef3ea0111b6eacb6b85664030820 (patch)
tree7c7889d31d677de4b6f2c9a3859616985fd9d6ff /opengl/java/android/opengl/Material.java
parent09b481e1d4c3f21aebfaf0aec51fc621cdfa0c90 (diff)
parent0070b4dde5da29806b2da7f1c94689125da4b139 (diff)
Merge "App Pinning strings; security notes on startup dialog." into rvc-dev am: 0fda8bb2f0 am: 0070b4dde5
Change-Id: Ib73253c408a56abfc6c98972337a81619691d457
Diffstat (limited to 'opengl/java/android/opengl/Material.java')
0 files changed, 0 insertions, 0 deletions