summaryrefslogtreecommitdiff
path: root/opengl/java/android/opengl/Material.java
diff options
context:
space:
mode:
authorSarah Chin <sarahchin@google.com>2020-06-23 00:08:56 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-23 00:08:56 +0000
commit14d27ed12b7b92e1c2f881bcba8dfeef9d22e1bc (patch)
treeb387cfc4fe26dfbb647707dcf216ee592510d49c /opengl/java/android/opengl/Material.java
parent80594d7608982336bb3aaf7af24fc2522e8afc79 (diff)
parentbcd81e79222b5bf63a0516527d27eb88ad119e03 (diff)
[automerger skipped] Merge "Update UL values for NR" am: de4959769d am: 34c00e7865 -s ours am: 0510319743 -s ours am: fcbd21fdf6 -s ours am: bcd81e7922 -s ours
am skip reason: Change-Id I2d548711c5de9683b57dc7bbeea9379d23b18343 with SHA-1 6963421dfe is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1346647 Change-Id: Ie46aeec497c7b65e20273a6a9d4971cc9ffe59ea
Diffstat (limited to 'opengl/java/android/opengl/Material.java')
0 files changed, 0 insertions, 0 deletions