diff options
| author | Mark Chien <markchien@google.com> | 2020-05-25 11:03:34 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-25 11:03:34 +0000 |
| commit | 6285a4ef0d2d2932e6c1a6769751c046410ee7a8 (patch) | |
| tree | c9a417a3853683d10f7d087babb674ac3b746d4e /opengl/java/android/opengl/Material.java | |
| parent | cebc2248aaf73388169a1491cb98c8beedf6f426 (diff) | |
| parent | ccaa16474a11e5298ea3845a266ab94664003e6a (diff) | |
[automerger skipped] Merge "TetheringServiceTest: test caller permission" into rvc-dev am: f7862f53ad -s ours am: ccaa16474a -s ours
am skip reason: Change-Id I7beea3f011d930e433443ed62d772a3f8cce5d78 with SHA-1 aebd81875e is in history
Change-Id: I698d9684107bf6eed20fe71d4f47fde89374a730
Diffstat (limited to 'opengl/java/android/opengl/Material.java')
0 files changed, 0 insertions, 0 deletions