diff options
| author | Mark Chien <markchien@google.com> | 2020-05-30 15:15:24 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-30 15:15:24 +0000 |
| commit | a6f3cb82b32d28fcb5f608041238bad200a85120 (patch) | |
| tree | dced568d63381ab425662b7f5f6d4834b1824004 /opengl/java/android/opengl/Material.java | |
| parent | ae86d8a04b84e4395648ee24fc741307089b3b5e (diff) | |
| parent | 2869e393b39268f66b39a63f51e73af602f0de74 (diff) | |
[automerger skipped] Merge "Tethering: ensure downstream prefix do not conflict with upstream" into rvc-dev am: 495145fa63 am: 31172269d3 am: 2869e393b3 -s ours
am skip reason: Change-Id Ib45b87bcd9eeb5da03fb7ec90b1af9ca53998cf5 with SHA-1 db6befbd17 is in history
Change-Id: I428349d7804d02610177c51d0a532358b661dc66
Diffstat (limited to 'opengl/java/android/opengl/Material.java')
0 files changed, 0 insertions, 0 deletions