diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-09 19:04:44 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-09 19:04:44 +0000 |
| commit | a46304da61f37668b5bf7de14f3b39fb388633c3 (patch) | |
| tree | 9447ebad8b94584558cea8ff40f21ac450953e21 /rs/java/android/renderscript/ProgramFragment.java | |
| parent | 162bd52b61b2881288f24aa30777c18b0999d36a (diff) | |
| parent | 357fd04b12f6e88ad956db1a197af0aeb1a9011c (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: 357fd04b12 -s ours
am skip reason: Change-Id I8a1575dedd6e3b7a8b60ee2ffd475d790aec55c4 with SHA-1 2e1da35b3b is in history
Change-Id: I5b65a90ca11912a369680f58d82d22e381f110ca
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragment.java')
0 files changed, 0 insertions, 0 deletions