diff options
| author | Kevin Chyn <kchyn@google.com> | 2020-05-15 22:32:52 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-15 22:32:52 +0000 |
| commit | fab17fe47ca3d3d2f82cb1bdc5eb05415569a576 (patch) | |
| tree | f41bab23e842edc4a8b2e98f923399d068121aa5 /opengl/java/android/opengl/Material.java | |
| parent | d4660a3ed964357a9883f9dc79bb2e0ac367485d (diff) | |
| parent | d1fd2a90bd6eab557a299cce76c1bac734a32c76 (diff) | |
Merge changes from topic "lockoutreset" into rvc-dev am: 8838c087b0 am: d1fd2a90bd
Change-Id: Ib45c61ee3c4dca1f22ebaee80f4595d94f3896de
Diffstat (limited to 'opengl/java/android/opengl/Material.java')
0 files changed, 0 insertions, 0 deletions