diff options
| author | Bill Yi <byi@google.com> | 2019-08-06 23:34:28 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-08-06 23:34:28 -0700 |
| commit | d424966429cf40ae793217db237e1ff032d43f70 (patch) | |
| tree | 4a296cb319eb9bfe8501e36947aa1eee6a440e3f /opengl/java/android/opengl/Material.java | |
| parent | af7de0ed39ea0fca5ac610acd3bd22545799e7f1 (diff) | |
| parent | 673e5d6d21fbf9f264cf0795620a989048f030f6 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 6aa3f38983 -s ours am: 1daf3587cb -s ours am: 4a28946f40 -s ours
am: 673e5d6d21 -s ours
am skip reason: subject contains skip directive
Change-Id: I589cf38375230304dacb1cbd7c0ba0b5742f9e34
Diffstat (limited to 'opengl/java/android/opengl/Material.java')
0 files changed, 0 insertions, 0 deletions