diff options
| author | Zoey Chen <zoeychen@google.com> | 2021-08-24 10:09:52 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-08-24 10:09:52 +0000 |
| commit | 1902c78ce2d1298f14b8fc6c560d6cfb9938366b (patch) | |
| tree | 5cb20671496370ab5aa8ae299fa2133bcdd2f731 /opengl/java/android/opengl/Material.java | |
| parent | 001ec6038a696f61a77de0ebc3112587371a0163 (diff) | |
| parent | 51b6659ae15e2509512d6fa0e32fe2edf1a1b6e8 (diff) | |
Merge changes Ib5ac6ee9,Ib127ad43,I37a423f3 into sc-qpr1-dev
* changes:
[ProviderModel] Cherry-pick from master ag/15207286, ag/15216391 and ag/15205988
[Provider Model] Cherry-pick from master ag/15008434, ag/15023697 and ag/15023698
[ProviderModel] Add InternetDialogController for internet dialog
Diffstat (limited to 'opengl/java/android/opengl/Material.java')
0 files changed, 0 insertions, 0 deletions