diff options
| author | Bill Yi <byi@google.com> | 2019-08-06 21:12:17 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-08-06 21:12:17 -0700 |
| commit | af7de0ed39ea0fca5ac610acd3bd22545799e7f1 (patch) | |
| tree | 4a296cb319eb9bfe8501e36947aa1eee6a440e3f /opengl/java/android/opengl/Material.java | |
| parent | 419dc6cb577ef866e5df51c743b728b8e284f21e (diff) | |
| parent | 6a1ec1b167a5cfbc0a2c05025cacf0b80023ba63 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: b672a3f6f6 -s ours am: 0d200f3d18 -s ours
am: 6a1ec1b167 -s ours
am skip reason: subject contains skip directive
Change-Id: Icb68c78ef6b4b08bb325be2646c2fbe83bedd4d6
Diffstat (limited to 'opengl/java/android/opengl/Material.java')
0 files changed, 0 insertions, 0 deletions