diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-08-10 21:09:46 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-10 21:09:46 +0000 |
| commit | 9d8de15ae363e0f35e1c587ee10ef496717469d0 (patch) | |
| tree | 72ed70b402681c1fbb97b86e64c2b80f37ae8f64 /opengl/java/android/opengl/Material.java | |
| parent | 6dd0e9b9856eeed9ab34b4e14dc941dfbb1a3c8d (diff) | |
| parent | 10419d46a5d20b6152a54f65b0461e2e1fda196c (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 5f7ad43cdf -s ours am: fcd7401cfd -s ours am: 10419d46a5 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15509039
Change-Id: I26349968d08a45b7462200fcf40b21418dfe8615
Diffstat (limited to 'opengl/java/android/opengl/Material.java')
0 files changed, 0 insertions, 0 deletions