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