diff options
| author | Linus Tufvesson <lus@google.com> | 2020-06-03 13:05:36 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-03 13:05:36 +0000 |
| commit | ad75c72411e4caa86c2e802dce9c48ca27de3b9e (patch) | |
| tree | 453df62d3033ad3fd9d219575960b083c897409b /opengl/java/android/opengl/Material.java | |
| parent | b44391c6269dcf72ce4032b5ff193b675a62cf35 (diff) | |
| parent | 08e1fc6b97becabe6434013745c0c98537c6b67a (diff) | |
[automerger skipped] RESTRICT AUTOMERGE am: 78fe3b0aa2 am: c2a8913cf0 am: 12b250968b -s ours am: a5f045da44 -s ours am: f6d5e9eafc am: 67c9729b65 -s ours am: c53f9fcddf am: 08e1fc6b97
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11375232
Change-Id: I649143cd15ddc63d069e16ba4b374489de292a23
Diffstat (limited to 'opengl/java/android/opengl/Material.java')
0 files changed, 0 insertions, 0 deletions