diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-09 18:32:12 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-09 18:32:12 +0000 |
| commit | 357fd04b12f6e88ad956db1a197af0aeb1a9011c (patch) | |
| tree | 7cd36e4c78641b0c4157df0a06255ae2a4192e6c /rs/java/android/renderscript/RenderScriptGL.java | |
| parent | 687572f47c794f6104003b5a06bfb7d0421ca6e7 (diff) | |
| parent | fd5aea2b96b59fb2805aee05d4a7be36f3c6b005 (diff) | |
[automerger skipped] Merge "Fix security problem on PermissionMonitor#hasPermission" into pi-dev am: 361f1e97f6 -s ours am: 92b897e4a8 -s ours am: fd5aea2b96 -s ours
am skip reason: Change-Id I2da730feda4d7ebed1f158b073167bb3964b3e7d with SHA-1 9352cb24b1 is in history
Change-Id: I04970c02f44adbff3c713c81a18840b3d4c2c7d8
Diffstat (limited to 'rs/java/android/renderscript/RenderScriptGL.java')
0 files changed, 0 insertions, 0 deletions