diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-06 14:12:51 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-06 14:12:51 +0000 |
| commit | ea6b6864ed084ceb0199135bfe4e92edf0dd9e59 (patch) | |
| tree | 96319ce687be223f5c959b2c5c8f8499a6395418 /opengl/java/android/opengl/Material.java | |
| parent | 51d4ce655ac3b5822421d53a0b20d8382a241202 (diff) | |
| parent | 3aa21e751b553019339ea82e4dc10517d1e49aa8 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 3d0177a9b6 -s ours am: 3aa21e751b -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11763040
Change-Id: I79db86fdf157980e98b6019333e4b0efb0ea2156
Diffstat (limited to 'opengl/java/android/opengl/Material.java')
0 files changed, 0 insertions, 0 deletions