diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-29 04:34:01 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-29 04:34:01 +0000 |
| commit | 26b505e2d620f9b8f87a35d91af0e13b59f92ece (patch) | |
| tree | d3c6d2f67ca3a1c7b5ea5aab1fe880e113853fbd /rs/java/android/renderscript/ProgramStore.java | |
| parent | 141b7fd731c646377784d422a2630baba3442ccf (diff) | |
| parent | 25996d45d628b8e2a0ee2f9d6ac53569fbb155e6 (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 am: 25996d45d6 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12366889
Change-Id: Ia77682f9d4b3aa1f0a569dacd76e58bdf86d09f6
Diffstat (limited to 'rs/java/android/renderscript/ProgramStore.java')
0 files changed, 0 insertions, 0 deletions