diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-24 08:01:02 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-24 08:01:02 +0000 |
| commit | c9705440948ea33f676e8e69b38c24dc55b70c0f (patch) | |
| tree | f78e01423985c89d772278f8bc5b770321df1b18 /opengl/java/android/opengl/Material.java | |
| parent | 3bc542d9a5fb08769b3d20062cfb76541891cfb9 (diff) | |
| parent | 02b9554b2cd9a8fbf11674469853bb9880d2a7cc (diff) | |
Merge "Change permissionLevel of ACCESS_SHORTCUTS and UNLIMITED_SHORTCUTS_API_CALLS" into qt-qpr1-dev am: 75cf9d73ec am: 02b9554b2c
Change-Id: I8d8f28e9e4230e02159074abcc08f95b4c41a6c9
Diffstat (limited to 'opengl/java/android/opengl/Material.java')
0 files changed, 0 insertions, 0 deletions