diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2019-08-06 23:37:57 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-08-06 23:37:57 -0700 |
| commit | d645525532a31961e593531299b287df4c030f51 (patch) | |
| tree | 4a296cb319eb9bfe8501e36947aa1eee6a440e3f /opengl/java/android/opengl/Material.java | |
| parent | d424966429cf40ae793217db237e1ff032d43f70 (diff) | |
| parent | 76600808e140a248dcd1fb92eceac830c2df8eab (diff) | |
[automerger skipped] Merge "Merge "[RESTRICT AUTOMERGE] CameraServiceProxy: More granularity to NFC / Camera interaction" into qt-r1-dev am: 33c07d1c38 am: 30f7b09097" into qt-qpr1-dev-plus-aosp
am: 76600808e1 -s ours
am skip reason: subject contains skip directive
Change-Id: Ie787dac3cf33ec68a75270d7af82e59e6a0cceb7
Diffstat (limited to 'opengl/java/android/opengl/Material.java')
0 files changed, 0 insertions, 0 deletions