diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-10-16 19:54:30 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-10-16 19:54:30 +0000 |
| commit | 506f6dc99ce7e6c6acb7940b92769d4bfc8e8694 (patch) | |
| tree | 62e89bf70f22a6cf82b355c20208cc19c46b43f8 /rs/java/android/renderscript/ProgramStore.java | |
| parent | 77921064d58a19422d298fad2ccbfb80200fd135 (diff) | |
| parent | b7ce802f3fedd3c9283a2edcca30c368bc9c9599 (diff) | |
Merge changes from topic "am-051d3af580ca4b0f8f6af3ecafa9780b" into rvc-qpr-dev-plus-aosp
* changes:
Merge "[RESTRICT AUTOMERGE] Revert "[RESTRICT AUTOMERGE] Revert "Require permission to create trusted displays""" into rvc-dev am: 8b1151e4d5 am: 2f7396440e am: 0e0b74cf63
[RESTRICT AUTOMERGE] Revert "[RESTRICT AUTOMERGE] Revert "Require permission to create trusted displays"" am: c947b10f99 am: 1e0cf0c900 am: 2fb8485fbb
Diffstat (limited to 'rs/java/android/renderscript/ProgramStore.java')
0 files changed, 0 insertions, 0 deletions