diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-29 06:54:51 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-09-29 06:54:51 +0000 |
| commit | 841cf2f7187ef06a7d80058c086468c96611115c (patch) | |
| tree | 09bbbe647cf90aad786d5cd74f4b878806a2921b /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 09946445f1fea41810b3bbdef0774754f709b11f (diff) | |
| parent | 7efa36dfa6918a4ad54664f50bbb376ff20c679c (diff) | |
Merge changes from topic "am-8890be08bd9b4c77a6b9786a47fd66a9" into rvc-qpr-dev-plus-aosp
* changes:
Merge "[RESTRICT AUTOMERGE] Revert "Require permission to create trusted displays"" into rvc-dev am: 5c393cb830 am: f9c533aae6 am: 4fc13f3491
[RESTRICT AUTOMERGE] Revert "Require permission to create trusted displays" am: ae03031efe am: 6c079ef0b5 am: f0daa2119f
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions