diff options
| author | Patrick Baumann <patb@google.com> | 2020-08-29 02:58:23 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-29 02:58:23 +0000 |
| commit | e2224619bef87343d1a5e2c1d86950b266592edc (patch) | |
| tree | d3c6d2f67ca3a1c7b5ea5aab1fe880e113853fbd /opengl/java/android/opengl/Material.java | |
| parent | 179f46cd17146172aa61503ab129891bbc677001 (diff) | |
| parent | 151bffbe42f8e4e63d2a18a2428a8a6a190cf3eb (diff) | |
[automerger skipped] RESTRICT AUTOMERGE am: 929ab61a14 -s ours am: 15a769dbc3 -s ours am: 20171d27de am: c1874ee282 -s ours am: 979db2c120 am: 6b99b593b1 am: 3282d334c5 am: 151bffbe42 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11230862
Change-Id: Icf136b393f7d6ee72f35b31205bcd9672a7d57b1
Diffstat (limited to 'opengl/java/android/opengl/Material.java')
0 files changed, 0 insertions, 0 deletions