diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-29 04:21:28 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-08-29 04:21:28 +0000 |
| commit | 25996d45d628b8e2a0ee2f9d6ac53569fbb155e6 (patch) | |
| tree | abeec9031eff02a101f3d65707648509cd311ce0 /rs/java/android/renderscript/ProgramStore.java | |
| parent | 4d7fdcf9c5338864c1857ee56c6671431cd759d5 (diff) | |
| parent | ca8c49d162c5bb4560991c4534d3f788f1bf144d (diff) | |
Merge "[automerger skipped] DO NOT MERGE Don't allow non-instant permissions for instant apps. am: a710a30457 am: ea36a0c236 am: 043a322e4d -s ours am: 29eef120e2 -s ours am: b984203cb2 am: 0482ee7eed -s ours am: 6d513e3306 am: dca36e934b am: 5141d72634" into rvc-qpr-dev-plus-aosp
Diffstat (limited to 'rs/java/android/renderscript/ProgramStore.java')
0 files changed, 0 insertions, 0 deletions