summaryrefslogtreecommitdiff
path: root/opengl/java/android/opengl/Material.java
diff options
context:
space:
mode:
authorSarah Chin <sarahchin@google.com>2020-06-23 00:08:24 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-23 00:08:24 +0000
commit80594d7608982336bb3aaf7af24fc2522e8afc79 (patch)
treeb387cfc4fe26dfbb647707dcf216ee592510d49c /opengl/java/android/opengl/Material.java
parent762a0142c61e296abb2a496ae681c3dc9a1e0a44 (diff)
parent6fd81a25c45e3513da0390ac5bf0b77caa93f434 (diff)
[automerger skipped] Merge "Create carrier config for NR enabled setting" am: c8d4118796 am: 30ef91f5b3 -s ours am: baa6bf21f7 -s ours am: 86e6de52d8 -s ours am: 6fd81a25c4 -s ours
am skip reason: Change-Id Ib81bb6b1712fcf53723df04f162c50a89c96e04d with SHA-1 39c87c67d8 is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1346922 Change-Id: If9099f362dc3a9472f0290571158c30dc8b3627e
Diffstat (limited to 'opengl/java/android/opengl/Material.java')
0 files changed, 0 insertions, 0 deletions